Try reusable flow

Yubico · May 6, 2024 · d7ccb24 · d7ccb24
1 parent 5f39837
commit d7ccb24
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/build-pull-requests.yml b/.github/workflows/build-pull-requests.yml
@@ -30,13 +30,14 @@ on:
       - '.github/workflows/build-pull-requests.yml'
 
 jobs:
+  test:
+    name: Run tests
+    uses: ./.github/workflows/test.yml
   build:
-    # Give this job a friendly name to show in GitHub UI.
-    name: Build and test
+    name: Build
     runs-on: windows-latest
 
     steps:
-      # Checkout the local repository
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
@@ -45,14 +46,9 @@ jobs:
       - name: Add local NuGet repository
         run: dotnet nuget add source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/Yubico/index.json"
 
-      # Build the project
       - name: Build Yubico.NET.SDK.sln
         run: dotnet build --configuration ReleaseWithDocs --nologo --verbosity normal Yubico.NET.SDK.sln
 
-      - name: Run tests
-        uses: ./.github/workflows/test.yml
-
-      # Save the built NuGet packages, just in case we need to inspect the build output.
       - name: Save build artifacts
         uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,8 +47,12 @@ permissions:
   packages: write
 
 jobs:
+  test:
+    name: Run tests
+    uses: ./.github/workflows/test.yml
+
   build:
-    name: Build, test, save artefacts
+    name: Build, save artefacts
     runs-on: windows-2019
 
     steps:
@@ -75,10 +79,6 @@ jobs:
       - name: Build Yubico.NET.SDK.sln
         run: dotnet build --configuration ReleaseWithDocs --nologo --verbosity normal Yubico.NET.SDK.sln
 
-      # Run tests 
-      - name: Run tests
-        uses: ./.github/workflows/test.yml
-
       # Upload artifacts
       - name: Save documentation artifacts
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -50,7 +50,7 @@ jobs:
     uses: ./.github/workflows/test-macos.yml
   coverage:
     runs-on: ubuntu-latest
-    needs: [test-windows]
+    needs: [test-windows] # No need to gather coverage on all platforms
     steps:
       - uses: actions/download-artifact@v4
       - name: Combine Coverage Reports # This is because one report is produced per project, and we want one result for all of them.