From b34f15679409fbded3e019f4e5b760877688d2a3 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Mon, 30 Nov 2020 17:37:35 -0500 Subject: [PATCH 1/3] [tests] Use correct output path when running with helix, so that the log .. files get surfaced to azdo. Thanks to @akoeplinger for the suggestion. --- eng/testing/AndroidRunnerTemplate.sh | 6 +++++- eng/testing/AppleRunnerTemplate.sh | 7 ++++++- eng/testing/WasmRunnerTemplate.sh | 6 +++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/eng/testing/AndroidRunnerTemplate.sh b/eng/testing/AndroidRunnerTemplate.sh index a1e89f0e7ea012..db06f4d56f5976 100644 --- a/eng/testing/AndroidRunnerTemplate.sh +++ b/eng/testing/AndroidRunnerTemplate.sh @@ -16,7 +16,11 @@ while true; do fi done -XHARNESS_OUT="$EXECUTION_DIR/xharness-output" +if [ -z "$HELIX_WORKITEM_UPLOAD_ROOT" ]; then + XHARNESS_OUT="$EXECUTION_DIR/xharness-output" +else + XHARNESS_OUT="$HELIX_WORKITEM_UPLOAD_ROOT/xharness-output" +fi if [ ! -z "$XHARNESS_CLI_PATH" ]; then # When running in CI, we only have the .NET runtime available diff --git a/eng/testing/AppleRunnerTemplate.sh b/eng/testing/AppleRunnerTemplate.sh index b78bff38d867a2..44987ab48b5633 100644 --- a/eng/testing/AppleRunnerTemplate.sh +++ b/eng/testing/AppleRunnerTemplate.sh @@ -36,7 +36,12 @@ while true; do done XCODE_PATH="`xcode-select -p`/../.." -export XHARNESS_OUT="$EXECUTION_DIR/xharness-output" + +if [ -z "$HELIX_WORKITEM_UPLOAD_ROOT" ]; then + export XHARNESS_OUT="$EXECUTION_DIR/xharness-output" +else + export XHARNESS_OUT="$HELIX_WORKITEM_UPLOAD_ROOT/xharness-output" +fi dotnet xharness ios test \ --targets="$TARGET" \ diff --git a/eng/testing/WasmRunnerTemplate.sh b/eng/testing/WasmRunnerTemplate.sh index e2e3996cab58c0..f52cdc5dcc32e7 100644 --- a/eng/testing/WasmRunnerTemplate.sh +++ b/eng/testing/WasmRunnerTemplate.sh @@ -4,7 +4,11 @@ EXECUTION_DIR=$(dirname $0) cd $EXECUTION_DIR -XHARNESS_OUT="$EXECUTION_DIR/xharness-output" +if [ -z "$HELIX_WORKITEM_UPLOAD_ROOT" ]; then + XHARNESS_OUT="$EXECUTION_DIR/xharness-output" +else + XHARNESS_OUT="$HELIX_WORKITEM_UPLOAD_ROOT/xharness-output" +fi if [ ! -z "$XHARNESS_CLI_PATH" ]; then # When running in CI, we only have the .NET runtime available From 46f98fb3ead92e1999686354fcabcfb35731d42d Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Mon, 30 Nov 2020 19:06:18 -0500 Subject: [PATCH 2/3] Create dotnet-core.yml --- .github/workflows/dotnet-core.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/dotnet-core.yml diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml new file mode 100644 index 00000000000000..cc81720d8a6b19 --- /dev/null +++ b/.github/workflows/dotnet-core.yml @@ -0,0 +1,25 @@ +name: .NET Core + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 3.1.301 + - name: Install dependencies + run: dotnet restore + - name: Build + run: make -C src/mono/wasm build-all + - name: Test + run: dotnet test src/mono/wasm/debugger/DebuggerTestSuite From b3a3356de50db62fb723fe346800a54d489f3d83 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Sun, 28 Mar 2021 21:14:03 -0400 Subject: [PATCH 3/3] Create dotnet.yml --- .github/workflows/dotnet.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/dotnet.yml diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml new file mode 100644 index 00000000000000..891ef2b90080e4 --- /dev/null +++ b/.github/workflows/dotnet.yml @@ -0,0 +1,26 @@ +name: .NET + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 5.0.x + - name: Restore dependencies + run: dotnet restore + + - name: Build + run: make -C src/mono/wasm build-all + - name: Test + run: make -C src/mono/wasm debugger-tests