From 77d672261a484363bdecdd1c4c449d7163c3b065 Mon Sep 17 00:00:00 2001 From: Nikola Irinchev Date: Sat, 16 Oct 2021 12:24:59 +0200 Subject: [PATCH 1/2] Bring back the win81 tests --- .github/templates/main.yml | 4 ++-- .github/workflows/main.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/templates/main.yml b/.github/templates/main.yml index 1b173ea9b8..f4a2bc8d0d 100644 --- a/.github/templates/main.yml +++ b/.github/templates/main.yml @@ -446,7 +446,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ macos-latest, windows-latest, ubuntu-latest ] + os: [ macos-latest, windows-latest, ubuntu-latest, win81 ] targetFramework: [ netcoreapp3.1, net5.0, net6.0 ] steps: - name: Cleanup Workspace @@ -457,7 +457,7 @@ jobs: - uses: #@ actionSetupDotnet if: matrix.targetFramework == 'net6.0' with: - dotnet-version: '6.0.100-preview.7.21379.14' + dotnet-version: '6.0.100-rc.2' include-prerelease: true - #@ template.replace(dotnetPublishAndRunTests("Tests/Realm.Tests", "${{ matrix.targetFramework }}", "Realm.Tests --result=TestResults.xml --labels=After")) - #@ publishTestsResults("TestResults.xml", ".NET (${{ matrix.os }}, ${{ matrix.targetFramework }})") diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2949005898..0fc5d4a091 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -592,6 +592,7 @@ jobs: - macos-latest - windows-latest - ubuntu-latest + - win81 targetFramework: - netcoreapp3.1 - net5.0 @@ -622,7 +623,7 @@ jobs: - uses: actions/setup-dotnet@v1 if: matrix.targetFramework == 'net6.0' with: - dotnet-version: 6.0.100-preview.7.21379.14 + dotnet-version: 6.0.100-rc.2 include-prerelease: true - name: Publish Tests/Realm.Tests run: dotnet publish Tests/Realm.Tests -c Release -f ${{ matrix.targetFramework }} -r ${{ (runner.os == 'macOS' && 'osx-x64') || (runner.os == 'Windows' && 'win-x64') || (runner.os == 'Linux' && 'linux-x64') || '???' }} -p:AdditionalFrameworks=${{ matrix.targetFramework }} -p:RestoreConfigFile=Tests/Test.NuGet.Config -p:UseRealmNupkgsWithVersion=${{ needs.build-packages.outputs.package_version }} --no-self-contained From 99e6079f0a801f0c5e8a20d8629eb7a19917eb59 Mon Sep 17 00:00:00 2001 From: Nikola Irinchev Date: Mon, 18 Oct 2021 14:47:45 +0200 Subject: [PATCH 2/2] Use 6.0.x for the setup donet action --- .github/templates/main.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/templates/main.yml b/.github/templates/main.yml index f4a2bc8d0d..f47e2f1bed 100644 --- a/.github/templates/main.yml +++ b/.github/templates/main.yml @@ -457,7 +457,7 @@ jobs: - uses: #@ actionSetupDotnet if: matrix.targetFramework == 'net6.0' with: - dotnet-version: '6.0.100-rc.2' + dotnet-version: '6.0.x' include-prerelease: true - #@ template.replace(dotnetPublishAndRunTests("Tests/Realm.Tests", "${{ matrix.targetFramework }}", "Realm.Tests --result=TestResults.xml --labels=After")) - #@ publishTestsResults("TestResults.xml", ".NET (${{ matrix.os }}, ${{ matrix.targetFramework }})") diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0fc5d4a091..e3fcdedc50 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -623,7 +623,7 @@ jobs: - uses: actions/setup-dotnet@v1 if: matrix.targetFramework == 'net6.0' with: - dotnet-version: 6.0.100-rc.2 + dotnet-version: 6.0.x include-prerelease: true - name: Publish Tests/Realm.Tests run: dotnet publish Tests/Realm.Tests -c Release -f ${{ matrix.targetFramework }} -r ${{ (runner.os == 'macOS' && 'osx-x64') || (runner.os == 'Windows' && 'win-x64') || (runner.os == 'Linux' && 'linux-x64') || '???' }} -p:AdditionalFrameworks=${{ matrix.targetFramework }} -p:RestoreConfigFile=Tests/Test.NuGet.Config -p:UseRealmNupkgsWithVersion=${{ needs.build-packages.outputs.package_version }} --no-self-contained