Skip to content

CI: run arm workflows on arm runner #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidmhewitt merged 1 commit into from
Feb 25, 2025
Merged

CI: run arm workflows on arm runner #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,31 @@ on:

jobs:
flatpak:
name: Flatpak
runs-on: ubuntu-latest
name: Flatpak (${{ matrix.configuration.arch }})
runs-on: ${{ matrix.configuration.runs-on }}

strategy:
matrix:
arch: [x86_64, aarch64]
configuration:
- arch: x86_64
runs-on: ubuntu-latest
- arch: aarch64
runs-on: ubuntu-24.04-arm
# Don't fail the whole workflow if one architecture fails
fail-fast: false

container:
image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.arch }}
image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }}
options: --privileged

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up QEMU for aarch64 emulation
if: ${{ matrix.arch != 'x86_64' }}
uses: docker/setup-qemu-action@v3
with:
platforms: arm64

- name: Install Rust SDK extension
run: |
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak install -y --arch=${{matrix.arch}} org.freedesktop.Sdk.Extension.rust-stable//23.08
flatpak install -y --arch=${{ matrix.configuration.arch }} org.freedesktop.Sdk.Extension.rust-stable//23.08

- name: Build
uses: flatpak/flatpak-github-actions/flatpak-builder@v6.4
Expand All @@ -49,7 +47,7 @@ jobs:
repository-url: https://flatpak.elementary.io/repo.flatpakrepo
cache-key: "flatpak-builder-${{ github.sha }}"
branch: daily
arch: ${{ matrix.arch }}
arch: ${{ matrix.configuration.arch }}

lint:
name: Lint
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,31 @@ on:

jobs:
deploy_flatpak:
name: Deploy Flatpak
runs-on: ubuntu-latest
name: Deploy Flatpak (${{ matrix.configuration.arch }})
runs-on: ${{ matrix.configuration.runs-on }}

strategy:
matrix:
arch: [x86_64, aarch64]
configuration:
- arch: x86_64
runs-on: ubuntu-latest
- arch: aarch64
runs-on: ubuntu-24.04-arm
# Don't fail the whole workflow if one architecture fails
fail-fast: false

container:
image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.arch }}
image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }}
options: --privileged

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up QEMU for aarch64 emulation
if: ${{ matrix.arch != 'x86_64' }}
uses: docker/setup-qemu-action@v3
with:
platforms: arm64

- name: Install Rust SDK extension
run: |
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak install -y --arch=${{matrix.arch}} org.freedesktop.Sdk.Extension.rust-stable//23.08
flatpak install -y --arch=${{ matrix.configuration.arch }} org.freedesktop.Sdk.Extension.rust-stable//23.08

- name: Build
uses: flatpak/flatpak-github-actions/flatpak-builder@v6.4
Expand All @@ -46,7 +44,7 @@ jobs:
repository-url: https://flatpak.elementary.io/repo.flatpakrepo
cache-key: "flatpak-builder-${{ github.sha }}"
branch: daily
arch: ${{ matrix.arch }}
arch: ${{ matrix.configuration.arch }}

- name: Deploy
uses: flatpak/flatpak-github-actions/flat-manager@v6.4
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,35 +28,33 @@ jobs:
release_branch: 'odin'

deploy_flatpak:
name: Deploy Flatpak
runs-on: ubuntu-latest
name: Deploy Flatpak (${{ matrix.configuration.arch }})
runs-on: ${{ matrix.configuration.runs-on }}

if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')

strategy:
matrix:
arch: [x86_64, aarch64]
configuration:
- arch: x86_64
runs-on: ubuntu-latest
- arch: aarch64
runs-on: ubuntu-24.04-arm
# Don't fail the whole workflow if one architecture fails
fail-fast: false

container:
image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.arch }}
image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }}
options: --privileged

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up QEMU for aarch64 emulation
if: ${{ matrix.arch != 'x86_64' }}
uses: docker/setup-qemu-action@v3
with:
platforms: arm64

- name: Install Rust SDK extension
run: |
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak install -y --arch=${{matrix.arch}} org.freedesktop.Sdk.Extension.rust-stable//23.08
flatpak install -y --arch=${{ matrix.configuration.arch }} org.freedesktop.Sdk.Extension.rust-stable//23.08

- name: Build
uses: flatpak/flatpak-github-actions/flatpak-builder@v6.4
Expand All @@ -68,7 +66,7 @@ jobs:
repository-url: https://flatpak.elementary.io/repo.flatpakrepo
cache-key: "flatpak-builder-${{ github.sha }}"
branch: stable
arch: ${{ matrix.arch }}
arch: ${{ matrix.configuration.arch }}

- name: Deploy
uses: flatpak/flatpak-github-actions/flat-manager@v6.4
Expand Down