Skip to content

Commit 15393be

Browse files
authored
CI: run arm workflows on arm runner (#1541)
* CI: run arm workflows on arm runner * bump runtime
1 parent d13a00e commit 15393be

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,26 @@ jobs:
3232
3333
flatpak:
3434
name: Flatpak
35-
runs-on: ubuntu-latest
35+
runs-on: ${{ matrix.configuration.runs-on }}
3636

3737
strategy:
3838
matrix:
39-
arch: [x86_64, aarch64]
39+
configuration:
40+
- arch: x86_64
41+
runs-on: ubuntu-latest
42+
- arch: aarch64
43+
runs-on: ubuntu-24.04-arm
4044
# Don't fail the whole workflow if one architecture fails
4145
fail-fast: false
4246

4347
container:
44-
image: ghcr.io/elementary/flatpak-platform/runtime:7.1-${{ matrix.arch }}
48+
image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }}
4549
options: --privileged
4650

4751
steps:
4852
- name: Checkout
4953
uses: actions/checkout@v4
5054

51-
- name: Set up QEMU for aarch64 emulation
52-
if: ${{ matrix.arch != 'x86_64' }}
53-
uses: docker/setup-qemu-action@v3
54-
with:
55-
platforms: arm64
56-
5755
- name: Build
5856
uses: flatpak/flatpak-github-actions/[email protected]
5957
with:
@@ -62,7 +60,7 @@ jobs:
6260
repository-name: appcenter
6361
repository-url: https://flatpak.elementary.io/repo.flatpakrepo
6462
cache-key: "flatpak-builder-${{ github.sha }}"
65-
arch: ${{ matrix.arch }}
63+
arch: ${{ matrix.configuration.arch }}
6664

6765
lint:
6866
name: Lint

0 commit comments

Comments
 (0)