Merge pull request #484 from adamralph/tests

simplify and streamline tests
adamralph · Jan 24, 2021 · 7d6baba · 7d6baba
2 parents 265a617 + 8d840fc
commit 7d6baba
Show file tree

Hide file tree

Showing 3 changed files with 281 additions and 303 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,33 +23,40 @@ jobs:
             build: ./build.cmd
           - os: windows-2019
             build: ./build.cmd
-        package-tests:
+        tests:
           - sdk: 2.1.300
+            framework: netcoreapp2.1
           - sdk: 2.1.811
+            framework: netcoreapp2.1
           - sdk: 3.1.100
+            framework: netcoreapp3.1
           - sdk: 3.1.404
+            framework: netcoreapp3.1
           - sdk: 5.0.100
+            framework: net5.0
             push: true
-    name: ${{ matrix.job.os }}-${{ matrix.package-tests.sdk }}
+    name: ${{ matrix.job.os }}-${{ matrix.tests.sdk }}
     runs-on: ${{ matrix.job.os }}
     steps:
-      - name: setup-dotnet package-tests-sdk
-        if: matrix.package-tests.sdk != '5.0.100'
+      - name: setup-dotnet tests-sdk
+        if: matrix.tests.sdk != '5.0.100'
         uses: actions/setup-dotnet@v1.7.2
         with:
-          dotnet-version: "${{ matrix.package-tests.sdk }}"
+          dotnet-version: "${{ matrix.tests.sdk }}"
       - uses: actions/setup-dotnet@v1.7.2
         with:
           dotnet-version: "5.0.100"
       - run: dotnet --info
       - uses: actions/checkout@v2.3.4
       - env:
           CI_VERSION: ${{ secrets.CI_VERSION }}
-        run: ${{ matrix.job.build }} --package-tests-sdk ${{ matrix.package-tests.sdk }}
+          MINVER_TESTS_SDK: ${{ matrix.tests.sdk }}
+          MINVER_TESTS_FRAMEWORK: ${{ matrix.tests.framework }}
+        run: ${{ matrix.job.build }}
       - name: push
         env:
           API_KEY: ${{ secrets.MYGET_ADAMRALPH_CI_API_KEY }}
-        if: matrix.job.push && matrix.package-tests.push && env.API_KEY != ''
+        if: matrix.job.push && matrix.tests.push && env.API_KEY != ''
         run: |
           dotnet nuget push MinVer/**/*.nupkg --source https://www.myget.org/F/adamralph-ci/api/v2/package --api-key ${{ env.API_KEY }}
           dotnet nuget push minver-cli/**/*.nupkg --source https://www.myget.org/F/adamralph-ci/api/v2/package --api-key ${{ env.API_KEY }}