CI: Fix Windows build upload

This commit is contained in:
Stenzek 2024-05-15 02:10:35 +10:00
parent c116e5a1d5
commit 6d3f01c82b
No known key found for this signature in database
1 changed files with 20 additions and 49 deletions

View File

@ -86,12 +86,6 @@ jobs:
run: | run: |
"C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-x64-release-symbols.zip ./bin/x64/*.pdb "C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-x64-release-symbols.zip ./bin/x64/*.pdb
- name: Upload x64 release symbols artifact
uses: actions/upload-artifact@v4
with:
name: "windows"
path: "duckstation-windows-x64-release-symbols.zip"
- name: Remove extra bloat before archiving - name: Remove extra bloat before archiving
shell: cmd shell: cmd
run: | run: |
@ -107,7 +101,7 @@ jobs:
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: "windows" name: "windows"
path: "duckstation-windows-x64-release.zip" path: "duckstation-windows-x64-release*.zip"
windows-arm64-build: windows-arm64-build:
@ -177,12 +171,6 @@ jobs:
run: | run: |
"C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-arm64-release-symbols.zip ./bin/ARM64/*.pdb "C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-arm64-release-symbols.zip ./bin/ARM64/*.pdb
- name: Upload arm64 release symbols artifact
uses: actions/upload-artifact@v4
with:
name: "windows-arm64"
path: "duckstation-windows-arm64-release-symbols.zip"
- name: Remove extra bloat before archiving - name: Remove extra bloat before archiving
shell: cmd shell: cmd
run: | run: |
@ -198,7 +186,7 @@ jobs:
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: "windows-arm64" name: "windows-arm64"
path: "duckstation-windows-arm64-release.zip" path: "duckstation-windows-arm64-release*.zip"
linux-build: linux-build:
@ -405,30 +393,13 @@ jobs:
runs-on: "ubuntu-22.04" runs-on: "ubuntu-22.04"
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
steps: steps:
- name: Download Windows Artifacts - name: Download Artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: "windows" path: ./artifacts/
- name: Download Windows ARM64 Artifact - name: Display Downloaded Artifacts
uses: actions/download-artifact@v4 run: find ./artifacts/
with:
name: "windows-arm64"
- name: Download Qt AppImage Artifact
uses: actions/download-artifact@v4
with:
name: "linux-x64-appimage-qt"
- name: Download Flatpak Artifact
uses: actions/download-artifact@v4
with:
name: "linux-flatpak"
- name: Download MacOS Artifact
uses: actions/download-artifact@v4
with:
name: "macos"
- name: Create preview release - name: Create preview release
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
@ -439,13 +410,13 @@ jobs:
prerelease: true prerelease: true
title: "Latest Preview Build" title: "Latest Preview Build"
files: | files: |
windows/duckstation-windows-x64-release.zip ./artifacts/windows/duckstation-windows-x64-release.zip
windows/duckstation-windows-x64-release-symbols.zip ./artifacts/windows/duckstation-windows-x64-release-symbols.zip
windows-arm64/duckstation-windows-arm64-release.zip ./artifacts/windows-arm64/duckstation-windows-arm64-release.zip
windows-arm64/duckstation-windows-arm64-release-symbols.zip ./artifacts/windows-arm64/duckstation-windows-arm64-release-symbols.zip
linux-x64-appimage-qt/DuckStation-x64.AppImage ./artifacts/linux-x64-appimage-qt/DuckStation-x64.AppImage
linux-flatpak/duckstation-x64.flatpak ./artifacts/linux-flatpak/duckstation-x64.flatpak
macos/duckstation-mac-release.zip ./artifacts/macos/duckstation-mac-release.zip
- name: Create dev release - name: Create dev release
if: github.ref == 'refs/heads/dev' if: github.ref == 'refs/heads/dev'
@ -456,11 +427,11 @@ jobs:
prerelease: false prerelease: false
title: "Latest Rolling Release" title: "Latest Rolling Release"
files: | files: |
windows/duckstation-windows-x64-release.zip ./artifacts/windows/duckstation-windows-x64-release.zip
windows/duckstation-windows-x64-release-symbols.zip ./artifacts/windows/duckstation-windows-x64-release-symbols.zip
windows-arm64/duckstation-windows-arm64-release.zip ./artifacts/windows-arm64/duckstation-windows-arm64-release.zip
windows-arm64/duckstation-windows-arm64-release-symbols.zip ./artifacts/windows-arm64/duckstation-windows-arm64-release-symbols.zip
linux-x64-appimage-qt/DuckStation-x64.AppImage ./artifacts/linux-x64-appimage-qt/DuckStation-x64.AppImage
linux-flatpak/duckstation-x64.flatpak ./artifacts/linux-flatpak/duckstation-x64.flatpak
macos/duckstation-mac-release.zip ./artifacts/macos/duckstation-mac-release.zip