Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
stenzek committed Feb 1, 2025
1 parent b01c06b commit cc6cefc
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 18 deletions.
17 changes: 10 additions & 7 deletions .github/workflows/linux-flatpak-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@ on:

jobs:
linux-flatpak-build:
name: "x64"
runs-on: ubuntu-22.04
strategy:
matrix:
setup: [{arch: "x86_64", runner: "ubuntu-22.04"}, {arch: "aarch64", runner: "ubuntu-22.04-arm64"}]

runs-on: ${{ matrix.setup.runner }}
container:
image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8
options: --privileged
Expand Down Expand Up @@ -72,17 +75,17 @@ jobs:
- name: Build Flatpak
uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
with:
bundle: duckstation-x64.flatpak
bundle: duckstation-${{ matrix.setup.arch }}.flatpak
upload-artifact: false
manifest-path: scripts/packaging/flatpak/org.duckstation.DuckStation.yaml
arch: x86_64
arch: ${{ matrix.setup.arch }}
build-bundle: true
verbose: true
mirror-screenshots-url: https://dl.flathub.org/media
branch: stable
cache: true
restore-cache: true
cache-key: flatpak-x64-${{ hashFiles('scripts/packaging/flatpak/**/*.yaml') }}
cache-key: flatpak-${{ matrix.setup.arch }}-${{ hashFiles('scripts/packaging/flatpak/**/*.yaml') }}

- name: Validate Build
run: |
Expand All @@ -109,5 +112,5 @@ jobs:
- name: Upload Flatpak
uses: actions/upload-artifact@v4
with:
name: "linux-flatpak"
path: "duckstation-x64.flatpak"
name: "linux-flatpak-${{ matrix.setup.arch }}"
path: "duckstation-${{ matrix.setup.arch }}.flatpak"
24 changes: 13 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ on:
- '.github/ISSUE_TEMPLATE/*'

jobs:
windows:
name: 💻 Windows
uses: "./.github/workflows/windows-build.yml"
linux-appimage:
name: 🐧 Linux AppImage
uses: "./.github/workflows/linux-appimage-build.yml"
#windows:
# name: 💻 Windows
# uses: "./.github/workflows/windows-build.yml"
#linux-appimage:
# name: 🐧 Linux AppImage
# uses: "./.github/workflows/linux-appimage-build.yml"
linux-flatpak:
name: 📦 Linux Flatpak
uses: "./.github/workflows/linux-flatpak-build.yml"
macos:
name: 🍎 MacOS
uses: "./.github/workflows/macos-build.yml"
#macos:
# name: 🍎 MacOS
# uses: "./.github/workflows/macos-build.yml"

create-release:
name: 📤 Create Release
Expand Down Expand Up @@ -63,7 +63,8 @@ jobs:
./artifacts/windows-arm64/duckstation-windows-arm64-release-symbols.zip
./artifacts/linux-x64-appimage/DuckStation-x64.AppImage
./artifacts/linux-x64-sse2-appimage/DuckStation-x64-SSE2.AppImage
./artifacts/linux-flatpak/duckstation-x64.flatpak
./artifacts/linux-flatpak-x86_64/duckstation-x86_64.flatpak
./artifacts/linux-flatpak-aarch64/duckstation-aarch64.flatpak
./artifacts/macos/duckstation-mac-release.zip
- name: Create Rolling Release
Expand All @@ -83,6 +84,7 @@ jobs:
./artifacts/windows-arm64/duckstation-windows-arm64-release-symbols.zip
./artifacts/linux-x64-appimage/DuckStation-x64.AppImage
./artifacts/linux-x64-sse2-appimage/DuckStation-x64-SSE2.AppImage
./artifacts/linux-flatpak/duckstation-x64.flatpak
./artifacts/linux-flatpak-x86_64/duckstation-x86_64.flatpak
./artifacts/linux-flatpak-aarch64/duckstation-aarch64.flatpak
./artifacts/macos/duckstation-mac-release.zip

0 comments on commit cc6cefc

Please sign in to comment.