File tree 2 files changed +20
-6
lines changed
2 files changed +20
-6
lines changed Original file line number Diff line number Diff line change 12
12
13
13
strategy :
14
14
matrix :
15
+ arch : [x86_64, aarch64]
15
16
runtime :
16
17
- name : freedesktop-21.08
17
18
packages : org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
@@ -103,13 +104,26 @@ jobs:
103
104
# syntax = docker/dockerfile:experimental
104
105
FROM localhost:5000/fedora-base:latest
105
106
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 }}
107
108
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'
109
111
110
112
with :
111
113
allow : security.insecure
112
114
context : .
113
115
file : ${{ matrix.runtime.name }}.Dockerfile
114
116
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
+
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 }}
Original file line number Diff line number Diff line change @@ -67,14 +67,14 @@ jobs:
67
67
flatpak:
68
68
name: "Flatpak"
69
69
runs-on: ubuntu-latest
70
- container:
71
- image: bilelmoussaoui/flatpak-github-actions:gnome-40
72
- options: --privileged
73
70
strategy:
74
71
matrix:
75
72
arch: [x86_64, aarch64]
76
73
# Don't fail the whole workflow if one architecture fails
77
74
fail-fast: false
75
+ container:
76
+ image: bilelmoussaoui/flatpak-github-actions:gnome-40-${{ matrix.arch }}
77
+ options: --privileged
78
78
steps:
79
79
- uses: actions/checkout@v2
80
80
# Docker is required by the docker/setup-qemu-action which enables emulation
You can’t perform that action at this time.
0 commit comments