Add aarch64 architecture support to flatpak builds (#227)

elementary · Sep 23, 2021 · 883db72 · 883db72
1 parent 6207271
commit 883db72
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,30 +12,43 @@ jobs:
     name: Flatpak
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+      # Don't fail the whole workflow if one architecture fails
+      fail-fast: false
+
     container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:daily
+      image: ghcr.io/elementary/flatpak-platform/runtime:6-${{ matrix.arch }}
       options: --privileged
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Set up QEMU for aarch64 emulation
+        if: ${{ matrix.arch != 'x86_64' }}
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: arm64
+
       - name: Build
-        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
+        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
         with:
           bundle: screenshot.flatpak
           manifest-path: io.elementary.screenshot.yml
           run-tests: true
           repository-name: appcenter
           repository-url: https://flatpak.elementary.io/repo.flatpakrepo
           cache-key: "flatpak-builder-${{ github.sha }}"
+          arch: ${{ matrix.arch }}
 
   lint:
     runs-on: ubuntu-latest
-    
+
     container:
       image: valalang/lint
-      
+
     steps:
     - uses: actions/checkout@v2
     - name: Lint

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -10,26 +10,39 @@ jobs:
     name: Deploy Flatpak
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+      # Don't fail the whole workflow if one architecture fails
+      fail-fast: false
+
     container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:daily
+      image: ghcr.io/elementary/flatpak-platform/runtime:6-${{ matrix.arch }}
       options: --privileged
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Set up QEMU for aarch64 emulation
+        if: ${{ matrix.arch != 'x86_64' }}
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: arm64
+
       - name: Build
-        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
+        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
         with:
           bundle: screenshot.flatpak
           manifest-path: io.elementary.screenshot.yml
           repository-name: appcenter
           repository-url: https://flatpak.elementary.io/repo.flatpakrepo
           cache-key: "flatpak-builder-${{ github.sha }}"
           branch: daily
+          arch: ${{ matrix.arch }}
 
       - name: Deploy
-        uses: bilelmoussaoui/flatpak-github-actions/flat-manager@v3
+        uses: bilelmoussaoui/flatpak-github-actions/flat-manager@v4
         with:
           repository: appcenter
           flat-manager-url: https://flatpak-api.elementary.io

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
      steps:
        - name: Checkout
          uses: actions/checkout@v2
-       
+
        - name: Release
          uses: elementary/actions/release@master
          env:
@@ -30,19 +30,31 @@ jobs:
   deploy_flatpak:
     name: Deploy Flatpak
     runs-on: ubuntu-latest
-    
+
     if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
 
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+      # Don't fail the whole workflow if one architecture fails
+      fail-fast: false
+
     container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:6
+      image: ghcr.io/elementary/flatpak-platform/runtime:6-${{ matrix.arch }}
       options: --privileged
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Set up QEMU for aarch64 emulation
+        if: ${{ matrix.arch != 'x86_64' }}
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: arm64
+
       - name: Build
-        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@master
+        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
         with:
           bundle: screenshot.flatpak
           manifest-path: io.elementary.screenshot.yml
@@ -51,9 +63,10 @@ jobs:
           repository-url: https://flatpak.elementary.io/repo.flatpakrepo
           cache-key: "flatpak-builder-${{ github.sha }}"
           branch: stable
-
+          arch: ${{ matrix.arch }}
+
       - name: Deploy
-        uses: bilelmoussaoui/flatpak-github-actions/flat-manager@v3
+        uses: bilelmoussaoui/flatpak-github-actions/flat-manager@v4
         with:
           repository: appcenter
           flat-manager-url: https://flatpak-api.elementary.io