Skip to content

Commit

Permalink
CI: Fix Windows build upload
Browse files Browse the repository at this point in the history
  • Loading branch information
stenzek committed May 15, 2024
1 parent c116e5a commit 349fcfa
Showing 1 changed file with 20 additions and 49 deletions.
69 changes: 20 additions & 49 deletions .github/workflows/rolling-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,6 @@ jobs:
run: |
"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
shell: cmd
run: |
Expand All @@ -107,7 +101,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: "windows"
path: "duckstation-windows-x64-release.zip"
path: "duckstation-windows-x64-release*.zip"


windows-arm64-build:
Expand Down Expand Up @@ -177,12 +171,6 @@ jobs:
run: |
"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
shell: cmd
run: |
Expand All @@ -198,7 +186,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: "windows-arm64"
path: "duckstation-windows-arm64-release.zip"
path: "duckstation-windows-arm64-release*.zip"


linux-build:
Expand Down Expand Up @@ -405,30 +393,13 @@ jobs:
runs-on: "ubuntu-22.04"
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
steps:
- name: Download Windows Artifacts
- name: Download Artifacts
uses: actions/download-artifact@v4
with:
name: "windows"
path: ./artifacts/

- name: Download Windows ARM64 Artifact
uses: actions/download-artifact@v4
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: Display Downloaded Artifacts
run: find ./artifacts/

- name: Create preview release
if: github.ref == 'refs/heads/master'
Expand All @@ -439,13 +410,13 @@ jobs:
prerelease: true
title: "Latest Preview Build"
files: |
windows/duckstation-windows-x64-release.zip
windows/duckstation-windows-x64-release-symbols.zip
windows-arm64/duckstation-windows-arm64-release.zip
windows-arm64/duckstation-windows-arm64-release-symbols.zip
linux-x64-appimage-qt/DuckStation-x64.AppImage
linux-flatpak/duckstation-x64.flatpak
macos/duckstation-mac-release.zip
artifacts/duckstation-windows-x64-release.zip
artifacts/duckstation-windows-x64-release-symbols.zip
artifacts/duckstation-windows-arm64-release.zip
artifacts/duckstation-windows-arm64-release-symbols.zip
artifacts/DuckStation-x64.AppImage
artifacts/duckstation-x64.flatpak
artifacts/duckstation-mac-release.zip
- name: Create dev release
if: github.ref == 'refs/heads/dev'
Expand All @@ -456,11 +427,11 @@ jobs:
prerelease: false
title: "Latest Rolling Release"
files: |
windows/duckstation-windows-x64-release.zip
windows/duckstation-windows-x64-release-symbols.zip
windows-arm64/duckstation-windows-arm64-release.zip
windows-arm64/duckstation-windows-arm64-release-symbols.zip
linux-x64-appimage-qt/DuckStation-x64.AppImage
linux-flatpak/duckstation-x64.flatpak
macos/duckstation-mac-release.zip
artifacts/duckstation-windows-x64-release.zip
artifacts/duckstation-windows-x64-release-symbols.zip
artifacts/duckstation-windows-arm64-release.zip
artifacts/duckstation-windows-arm64-release-symbols.zip
artifacts/DuckStation-x64.AppImage
artifacts/duckstation-x64.flatpak
artifacts/duckstation-mac-release.zip

0 comments on commit 349fcfa

Please sign in to comment.