Add image generation with aarch64 runtimes

flatpak · Jun 30, 2022 · bd8a26a · bd8a26a
1 parent ddd1410
commit bd8a26a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -12,6 +12,7 @@ jobs:
 
     strategy:
       matrix:
+        arch: [x86_64, aarch64]
         runtime:
           - name: freedesktop-21.08
             packages: org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
@@ -103,13 +104,26 @@ jobs:
           # syntax = docker/dockerfile:experimental
           FROM localhost:5000/fedora-base:latest
 
-          RUN --security=insecure flatpak install -y --noninteractive ${{matrix.runtime.remote}} ${{ matrix.runtime.packages }}
+          RUN --security=insecure flatpak install -y --noninteractive --arch=${{ matrix.arch }} ${{ matrix.runtime.remote }} ${{ matrix.runtime.packages }}
 
-      - name: Build & push the ${{ matrix.runtime.name }} image to Docker Hub
+      - name: Build & push the ${{ matrix.runtime.name }}-x86_64 image to Docker Hub
+        if: matrix.arch == 'x86_64'
         uses: docker/[email protected]
         with:
           allow: security.insecure
           context: .
           file: ${{ matrix.runtime.name }}.Dockerfile
           push: true
-          tags: bilelmoussaoui/flatpak-github-actions:${{ matrix.runtime.name }}
+          tags: |
+            bilelmoussaoui/flatpak-github-actions:${{ matrix.runtime.name }}
+            bilelmoussaoui/flatpak-github-actions:${{ matrix.runtime.name }}-x86_64
+      
+      - name: Build & push the ${{ matrix.runtime.name }}-${{ matrix.arch }} image to Docker Hub
+        if: matrix.arch != 'x86_64'
+        uses: docker/[email protected]
+        with:
+          allow: security.insecure
+          context: .
+          file: ${{ matrix.runtime.name }}.Dockerfile
+          push: true
+          tags: bilelmoussaoui/flatpak-github-actions:${{ matrix.runtime.name }}-${{ matrix.arch }}
diff --git a/README.md b/README.md
@@ -67,14 +67,14 @@ jobs:
   flatpak:
     name: "Flatpak"
     runs-on: ubuntu-latest
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-40
-      options: --privileged
     strategy:
       matrix:
         arch: [x86_64, aarch64]
       # Don't fail the whole workflow if one architecture fails
       fail-fast: false
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-40-${{ matrix.arch }}
+      options: --privileged
     steps:
     - uses: actions/checkout@v2
     # Docker is required by the docker/setup-qemu-action which enables emulation