Merge branch 'branch_v1_10' of github.com:rcaelers/workrave into bran…

…ch_v1_10
rcaelers · Feb 15, 2025 · 7151b34 · 7151b34
2 parents 785ad61 + e419047
commit 7151b34
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -28,13 +28,23 @@ jobs:
       - name: Upload artifacts to GitHub
         uses: actions/upload-artifact@v4
         with:
-          name: applet
+          name: applet-${{ matrix.configuration }}-${{ matrix.platform }}
           path: |
             frontend/applets/win32/src/x64/Release/workrave-applet64.dll
             frontend/applets/win32/src/Release/workrave-applet.dll
             frontend/applets/win32/src/x64/Debug/workrave-applet64.dll
             frontend/applets/win32/src/Debug/workrave-applet.dll
 
+  merge:
+    runs-on: ubuntu-24.04
+    needs: [ build-windows ]
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: applet
+          pattern: applet-*
+
   build-mingw:
     runs-on: ubuntu-24.04
     needs: [ build-windows ]
@@ -169,7 +179,7 @@ jobs:
           name: artifact-${{ matrix.config.upload }}
           path: _deploy
 
-  merge:
+  merge-applets:
     runs-on: ubuntu-24.04
     needs: [ build-mingw, build-linux ]
     steps:
@@ -181,7 +191,7 @@ jobs:
 
   deploy:
     runs-on: ubuntu-24.04
-    needs: [ build-linux, build-mingw, merge ]
+    needs: [ build-linux, build-mingw, merge-applets ]
     if: github.event_name == 'push'
     steps:
       - uses: actions/checkout@v4