diff options
| -rw-r--r-- | .github/workflows/release-binaries.yml | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml index f986f13b23..c840daf942 100644 --- a/.github/workflows/release-binaries.yml +++ b/.github/workflows/release-binaries.yml @@ -180,13 +180,24 @@ jobs: } } windeployqt --release --no-translations build/release/bin/eglantine.exe - Compress-Archive -Path build/release/bin/* -DestinationPath "eglantine-${env:GITHUB_SHA}-windows-x86_64.zip" - - name: Upload binary + # The artifact is the bin folder itself: GitHub zips artifacts on download, and uploading a + # zip gave a zip inside a zip. The release job zips it once for the release. + - name: Upload Windows binary + if: matrix.platform == 'windows-x86_64' uses: actions/upload-artifact@v4 with: name: eglantine-${{ matrix.platform }}-${{ github.sha }} - path: eglantine-${{ github.sha }}-${{ matrix.platform }}.* + path: build/release/bin/ + if-no-files-found: error + retention-days: 7 + + - name: Upload Linux binary + if: matrix.platform == 'linux-x86_64' + uses: actions/upload-artifact@v4 + with: + name: eglantine-${{ matrix.platform }}-${{ github.sha }} + path: eglantine-${{ github.sha }}-${{ matrix.platform }}.AppImage if-no-files-found: error compression-level: 0 retention-days: 7 @@ -205,8 +216,15 @@ jobs: uses: actions/download-artifact@v4 with: pattern: eglantine-*-${{ github.sha }} - path: dist - merge-multiple: true + path: artifacts + + - name: Package release files + shell: bash + run: | + mkdir dist + (cd "artifacts/eglantine-windows-x86_64-${GITHUB_SHA}" && + zip -qr "${GITHUB_WORKSPACE}/dist/eglantine-${GITHUB_SHA}-windows-x86_64.zip" .) + cp "artifacts/eglantine-linux-x86_64-${GITHUB_SHA}/eglantine-${GITHUB_SHA}-linux-x86_64.AppImage" dist/ - name: Create release shell: bash |