From 0defce7134fcab4b57d7d4883e88833af09d7ce4 Mon Sep 17 00:00:00 2001 From: Rob Caelers Date: Sat, 15 Feb 2025 22:24:47 +0100 Subject: [PATCH 1/2] Fix CI --- .github/workflows/ci.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2b389e0dc..607b81372 100644 --- 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 ] From e419047cbad48ea270f30393a8b831d3d3f15e74 Mon Sep 17 00:00:00 2001 From: Rob Caelers Date: Sat, 15 Feb 2025 22:39:48 +0100 Subject: [PATCH 2/2] Fix CI --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 607b81372..e4f45e23f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -179,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: @@ -191,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