Skip to content

Commit

Permalink
Try aarch64 runner instead of QEMU
Browse files Browse the repository at this point in the history
  • Loading branch information
darkdragon-001 committed Jan 23, 2024
1 parent 48dc80a commit fe48709
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 19 deletions.
28 changes: 11 additions & 17 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -232,35 +232,29 @@ jobs:
retention-days: 1

# See https://github.com/flatpak/flatpak-github-actionsfor examples
# It also contains instructions on how to compile for other architectures via QEMU
flatpak:
name: Flatpak
runs-on: ubuntu-latest
container:
image: bilelmoussaoui/flatpak-github-actions:gnome-45
options: --privileged
strategy:
matrix:
arch: [x86_64, aarch64]
variant:
- arch: x86_64
runner: ubuntu-latest
- arch: aarch64
runner: ARM64
# Don't fail the whole workflow if one architecture fails
fail-fast: false
runs-on: ${{ matrix.variant.runner }}
container:
image: bilelmoussaoui/flatpak-github-actions:gnome-45
options: --privileged
steps:
- uses: actions/checkout@v4
# Docker is required by the docker/setup-qemu-action which enables emulation
- name: Install deps
if: ${{ matrix.arch != 'x86_64' }}
run: |
dnf -y install docker
- name: Set up QEMU
if: ${{ matrix.arch != 'x86_64' }}
id: qemu
uses: docker/setup-qemu-action@v2
with:
platforms: arm64
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with:
bundle: axolotl.flatpak
manifest-path: flatpak/org.nanuc.Axolotl.yml
branch: ${{ github.head_ref || github.ref_name }}
arch: ${{ matrix.arch }}
arch: ${{ matrix.variant.arch }}
build-bundle: true
upload-artifact: true
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ axolotl
builddir/
build/
target/
gopath/*
.clickable/*
*po~
*~~
Expand Down
5 changes: 4 additions & 1 deletion axolotl-web/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
node_modules
/dist

# We currently use npm package-lock.json
yarn.lock

# local env files
.env.local
.env.*.local
Expand All @@ -19,4 +22,4 @@ yarn-error.log*
*.njsproj
*.sln
*.sw?
/*.so
/*.so

0 comments on commit fe48709

Please sign in to comment.