Skip to content

Commit bd8a26a

Browse files
committed
Add image generation with aarch64 runtimes
1 parent ddd1410 commit bd8a26a

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

.github/workflows/docker.yml

+17-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15+
arch: [x86_64, aarch64]
1516
runtime:
1617
- name: freedesktop-21.08
1718
packages: org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
@@ -103,13 +104,26 @@ jobs:
103104
# syntax = docker/dockerfile:experimental
104105
FROM localhost:5000/fedora-base:latest
105106
106-
RUN --security=insecure flatpak install -y --noninteractive ${{matrix.runtime.remote}} ${{ matrix.runtime.packages }}
107+
RUN --security=insecure flatpak install -y --noninteractive --arch=${{ matrix.arch }} ${{ matrix.runtime.remote }} ${{ matrix.runtime.packages }}
107108
108-
- name: Build & push the ${{ matrix.runtime.name }} image to Docker Hub
109+
- name: Build & push the ${{ matrix.runtime.name }}-x86_64 image to Docker Hub
110+
if: matrix.arch == 'x86_64'
109111
uses: docker/[email protected]
110112
with:
111113
allow: security.insecure
112114
context: .
113115
file: ${{ matrix.runtime.name }}.Dockerfile
114116
push: true
115-
tags: bilelmoussaoui/flatpak-github-actions:${{ matrix.runtime.name }}
117+
tags: |
118+
bilelmoussaoui/flatpak-github-actions:${{ matrix.runtime.name }}
119+
bilelmoussaoui/flatpak-github-actions:${{ matrix.runtime.name }}-x86_64
120+
121+
- name: Build & push the ${{ matrix.runtime.name }}-${{ matrix.arch }} image to Docker Hub
122+
if: matrix.arch != 'x86_64'
123+
uses: docker/[email protected]
124+
with:
125+
allow: security.insecure
126+
context: .
127+
file: ${{ matrix.runtime.name }}.Dockerfile
128+
push: true
129+
tags: bilelmoussaoui/flatpak-github-actions:${{ matrix.runtime.name }}-${{ matrix.arch }}

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ jobs:
6767
flatpak:
6868
name: "Flatpak"
6969
runs-on: ubuntu-latest
70-
container:
71-
image: bilelmoussaoui/flatpak-github-actions:gnome-40
72-
options: --privileged
7370
strategy:
7471
matrix:
7572
arch: [x86_64, aarch64]
7673
# Don't fail the whole workflow if one architecture fails
7774
fail-fast: false
75+
container:
76+
image: bilelmoussaoui/flatpak-github-actions:gnome-40-${{ matrix.arch }}
77+
options: --privileged
7878
steps:
7979
- uses: actions/checkout@v2
8080
# Docker is required by the docker/setup-qemu-action which enables emulation

0 commit comments

Comments
 (0)