Skip to content

Commit 12240a1

Browse files
authored
Merge pull request #212 from OpenBrickProtocolFoundation/use_arm64_linux_runner
ci: use arm64 images
2 parents fb3d727 + 8cfef2f commit 12240a1

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,34 @@ jobs:
4343
architecture: ucrt-x86_64
4444
shell: 'msys2 {0}'
4545

46+
- name: Linux (ARM64)
47+
os: ubuntu
48+
os-version: 24.04-arm
49+
use-clang: false
50+
arm: true
51+
shell: bash
52+
4653
- name: Linux
4754
os: ubuntu
4855
os-version: 24.04
4956
use-clang: false
57+
arm: false
5058
shell: bash
5159

5260
- name: Linux Clang (libstdc++)
5361
os: ubuntu
5462
os-version: 24.04
5563
use-clang: true
5664
use-clang_stdlib: false
65+
arm: false
5766
shell: bash
5867

5968
- name: Linux Clang (libc++)
6069
os: ubuntu
6170
os-version: 24.04
6271
use-clang: true
6372
use-clang_stdlib: true
73+
arm: false
6474
shell: bash
6575

6676
- name: MacOS

.github/workflows/flatpak.yml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,24 @@ on:
1111
jobs:
1212
flatpak:
1313
name: Flatpak build (${{ matrix.config.arch }})
14-
runs-on: ubuntu-24.04
14+
runs-on: ubuntu-${{ matrix.config.os-version }}
1515
strategy:
1616
matrix:
1717
config:
1818
- arch: x86_64
19-
use_qemu: false
19+
os-version: 24.04
2020

2121
- arch: aarch64
22-
use_qemu: true
23-
qemu_arch: arm64
22+
os-version: 24.04-arm
2423
# Don't fail the whole workflow if one architecture fails
2524
fail-fast: false
2625
container:
27-
image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08
26+
image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-24.08
2827
options: --privileged
2928
steps:
3029
- uses: actions/checkout@v4
3130

32-
- name: Install deps
33-
if: ${{ matrix.config.use_qemu == true }}
34-
run: |
35-
dnf -y install docker
36-
37-
- name: Set up QEMU
38-
if: ${{ matrix.config.use_qemu == true }}
39-
id: qemu
40-
uses: docker/setup-qemu-action@v3
41-
with:
42-
platforms: ${{ matrix.config.qemu_arch }}
43-
44-
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
31+
- uses: flathub-infra/flatpak-github-actions/flatpak-builder@9386d85446c0f8c6b93dea3774002af2abcac3d5
4532
with:
4633
bundle: oopetris.flatpak
4734
manifest-path: io.github.openbrickprotocolfoundation.oopetris.yml

0 commit comments

Comments
 (0)