merged test workflows into build workflow

oruchreis · Oct 29, 2024 · 62abaf6 · 62abaf6
1 parent 9ecaa87
commit 62abaf6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,18 +5,22 @@ on:
     branches: [ master ]
     paths:
       - 'src/**.csproj'
-      - '.github/workflows/build.yml'
-  workflow_run:
-    workflows: 
-      - 'Windows Test'
-      - 'Unix Test'
-    branches: [ master ]
-    types: 
-      - completed
+      - 'src/**.cs'
+      - 'src/**.dll'      
+      - 'src/**.so'
+      - 'src/**.dylib'
+      - '.github/workflows/windows-test.yml'
+      - '.github/workflows/unix-test.yml'
 
 jobs:  
+  windows-test:
+    uses: ./.github/workflows/windows-test.yml
+
+  unix-test:
+    uses: ./.github/workflows/unix-test.yml
+
   upload-packages:  
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    needs: [windows-test, unix-test]
     runs-on: windows-2022
     strategy:
       matrix:
@@ -31,6 +35,8 @@ jobs:
         - 'Embedded.NativeAssets.AlpineLinux-x64'
     steps:
     - uses: actions/checkout@v2
+      with:
+        ref: ${{ github.event.workflow_run.head_branch }}
     - name: Caching
       uses: actions/cache@v2
       with:

diff --git a/.github/workflows/unix-test.yml b/.github/workflows/unix-test.yml
@@ -1,14 +1,8 @@
 name: Unix Test
 
 on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'src/**.csproj'
-      - 'src/**.cs'
-      - 'src/**.so'
-      - 'src/**.dylib'
-      - '.github/workflows/unix-test.yml'
+  workflow_dispatch:
+  workflow_call:
 
 jobs:
   ubuntu-test:

diff --git a/.github/workflows/windows-test.yml b/.github/workflows/windows-test.yml
@@ -1,13 +1,8 @@
 name: Windows Test
 
 on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'src/**.csproj'
-      - 'src/**.cs'
-      - 'src/**.dll'
-      - '.github/workflows/windows-test.yml'
+  workflow_dispatch:
+  workflow_call:
 
 jobs:
   windows-test: