From 9f199a470c45fd0adf443316cac9aed7345a372a Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 18 Jan 2025 16:55:25 -0500 Subject: [PATCH 1/2] ci: build nix packages for aarch64-linux Signed-off-by: seth (cherry picked from commit 8e8538b506b5f3ae2b2424599078966600bb764c) Signed-off-by: seth --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 991ddcd8c..b52a7ffa7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -663,6 +663,9 @@ jobs: - os: ubuntu-22.04 system: x86_64-linux + - os: ubuntu-22.04-arm + system: aarch64-linux + - os: macos-13 system: x86_64-darwin From ed2b5d4b0e42d40bcdc66d9e7299693206a8a3b4 Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 18 Jan 2025 17:05:17 -0500 Subject: [PATCH 2/2] ci: build flatpaks for arm Signed-off-by: seth (cherry picked from commit 66f0397087d9b88c93e69c5e26a138d235344546) Signed-off-by: seth --- .github/workflows/build.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b52a7ffa7..d3b48f500 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -631,10 +631,24 @@ jobs: ccache -s flatpak: - runs-on: ubuntu-latest + name: Flatpak (${{ matrix.arch }}) + + strategy: + fail-fast: false + matrix: + include: + - os: ubuntu-22.04 + arch: x86_64 + + - os: ubuntu-22.04-arm + arch: aarch64 + + runs-on: ${{ matrix.os }} + container: image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8 options: --privileged + steps: - name: Checkout uses: actions/checkout@v4 @@ -652,6 +666,7 @@ jobs: with: bundle: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-Flatpak.flatpak manifest-path: flatpak/org.prismlauncher.PrismLauncher.yml + arch: ${{ matrix.arch }} nix: name: Nix (${{ matrix.system }})