From 6981d87f610ac8022387733e794dd947866574b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Tue, 17 Dec 2024 21:40:19 -0500 Subject: [PATCH] ci: fix artifact merge --- .github/workflows/ossia-max.yml | 9 +++++---- .github/workflows/ossia-pd.yml | 11 ++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ossia-max.yml b/.github/workflows/ossia-max.yml index 9cb50a4d633..a6afe9cb92e 100644 --- a/.github/workflows/ossia-max.yml +++ b/.github/workflows/ossia-max.yml @@ -22,7 +22,7 @@ jobs: - name: Archive Max Package uses: actions/upload-artifact@v4 with: - name: ossia-max + name: ossia-max-macos path: artifacts/ossia - name: Upload logs @@ -50,7 +50,7 @@ jobs: - name: Archive Max Package uses: actions/upload-artifact@v4 with: - name: ossia-max + name: ossia-max-windows path: ./install/ossia-max-package/ossia - name: Upload logs @@ -65,10 +65,11 @@ jobs: needs: [ build-macos, build-windows ] if: startsWith(github.ref, 'refs/tags/') steps: - - uses: actions/download-artifact@v4.1.7 + - uses: actions/download-artifact@v4 with: - name: ossia-max + pattern: ossia-max-* path: ossia + merge-multiple: true - name: Rezip shell: bash run: | diff --git a/.github/workflows/ossia-pd.yml b/.github/workflows/ossia-pd.yml index 226a9490d75..7658fa92eba 100644 --- a/.github/workflows/ossia-pd.yml +++ b/.github/workflows/ossia-pd.yml @@ -33,7 +33,7 @@ jobs: - name: Archive Package uses: actions/upload-artifact@v4 with: - name: ossia-pd + name: ossia-pd-macos path: install/ossia-pd-package/ossia build-windows: @@ -51,7 +51,7 @@ jobs: - name: Archive Package uses: actions/upload-artifact@v4 with: - name: ossia-pd + name: ossia-pd-windows path: ./install/ossia-pd-package/ossia build-linux: @@ -67,7 +67,7 @@ jobs: - name: Archive Package uses: actions/upload-artifact@v4 with: - name: ossia-pd + name: ossia-pd-linux path: install/ossia-pd-package/ossia build-rpi: @@ -101,10 +101,11 @@ jobs: runs-on: ubuntu-latest needs: [ build-macos, build-windows, build-rpi, build-linux ] steps: - - uses: actions/download-artifact@v4.1.7 + - uses: actions/download-artifact@v4 with: - name: ossia-pd + pattern: ossia-pd-* path: ossia + merge-multiple: true - name: Rezip shell: bash run: |