Skip to content

Commit 51872e5

Browse files
committed
workflows: build and push opensuse arm64 images
Extend the build matrix to include opensuse arm64 images for samba-server, samba-ad-server and samba-client. Signed-off-by: Alexander Bachmann <[email protected]>
1 parent 0c61c51 commit 51872e5

File tree

1 file changed

+29
-9
lines changed

1 file changed

+29
-9
lines changed

.github/workflows/container-image.yml

+29-9
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ jobs:
4545
matrix:
4646
package_source: [default, nightly]
4747
os: [centos, fedora, opensuse]
48-
arch: [amd64]
48+
arch: [amd64, arm64]
4949
exclude:
5050
# there are no nightly packages for opensuse
5151
- package_source: nightly
5252
os: opensuse
53+
- os: centos
54+
arch: arm64
5355
include:
5456
- package_source: devbuilds
5557
os: centos
5658
arch: amd64
57-
- os: fedora
58-
arch: arm64
5959
runs-on: ubuntu-latest
6060
env:
6161
BUILDAH_FORMAT: oci
@@ -76,16 +76,15 @@ jobs:
7676
matrix:
7777
package_source: [default, nightly]
7878
os: [centos, fedora, opensuse]
79-
arch: [amd64]
79+
arch: [amd64, arm64]
8080
exclude:
8181
# there are no nightly packages for opensuse
8282
- package_source: nightly
8383
os: opensuse
8484
# the distro packages for centos do not include an ad-dc
8585
- package_source: default
8686
os: centos
87-
include:
88-
- os: fedora
87+
- os: centos
8988
arch: arm64
9089
runs-on: ubuntu-latest
9190
env:
@@ -106,9 +105,9 @@ jobs:
106105
strategy:
107106
matrix:
108107
os: [centos, fedora, opensuse]
109-
arch: [amd64]
110-
include:
111-
- os: fedora
108+
arch: [amd64, arm64]
109+
exclude:
110+
- os: centos
112111
arch: arm64
113112
runs-on: ubuntu-latest
114113
env:
@@ -263,6 +262,11 @@ jobs:
263262
with:
264263
image: "samba-server:default-fedora-arm64"
265264
container_engine: ${{ env.CONTAINER_CMD }}
265+
- name: Fetch server default-opensuse-arm64
266+
uses: ishworkh/[email protected]
267+
with:
268+
image: "samba-server:default-opensuse-arm64"
269+
container_engine: ${{ env.CONTAINER_CMD }}
266270
- name: Fetch server nightly-fedora-amd64
267271
uses: ishworkh/[email protected]
268272
with:
@@ -294,6 +298,11 @@ jobs:
294298
with:
295299
image: "samba-ad-server:default-fedora-arm64"
296300
container_engine: ${{ env.CONTAINER_CMD }}
301+
- name: Fetch ad-server default-opensuse-arm64
302+
uses: ishworkh/[email protected]
303+
with:
304+
image: "samba-ad-server:default-opensuse-arm64"
305+
container_engine: ${{ env.CONTAINER_CMD }}
297306
- name: Fetch ad-server nightly-fedora-amd64
298307
uses: ishworkh/[email protected]
299308
with:
@@ -315,6 +324,11 @@ jobs:
315324
with:
316325
image: "samba-client:default-fedora-arm64"
317326
container_engine: ${{ env.CONTAINER_CMD }}
327+
- name: Fetch client default-opensuse-arm64
328+
uses: ishworkh/[email protected]
329+
with:
330+
image: "samba-client:default-opensuse-arm64"
331+
container_engine: ${{ env.CONTAINER_CMD }}
318332
# (toolbox images)
319333
- name: Fetch toolbox default-fedora-amd64
320334
uses: ishworkh/[email protected]
@@ -331,16 +345,19 @@ jobs:
331345
--no-distro-qualified
332346
-i samba-server:default-fedora-amd64
333347
-i samba-server:default-fedora-arm64
348+
-i samba-server:default-opensuse-arm64
334349
-i samba-server:nightly-fedora-amd64
335350
-i samba-server:nightly-fedora-arm64
336351
-i samba-server:nightly-centos-amd64
337352
-i samba-server:devbuilds-centos-amd64
338353
-i samba-ad-server:default-fedora-amd64
339354
-i samba-ad-server:default-fedora-arm64
355+
-i samba-ad-server:default-opensuse-arm64
340356
-i samba-ad-server:nightly-fedora-amd64
341357
-i samba-ad-server:nightly-fedora-arm64
342358
-i samba-client:default-fedora-amd64
343359
-i samba-client:default-fedora-arm64
360+
-i samba-client:default-opensuse-arm64
344361
-i samba-toolbox:default-fedora-amd64
345362
- name: Push images
346363
run: >
@@ -352,12 +369,15 @@ jobs:
352369
--push-selected-tags=mixed
353370
-i ${REPO_BASE}/samba-server:default-fedora-amd64
354371
-i ${REPO_BASE}/samba-server:default-fedora-arm64
372+
-i ${REPO_BASE}/samba-server:default-opensuse-arm64
355373
-i ${REPO_BASE}/samba-server:nightly-fedora-amd64
356374
-i ${REPO_BASE}/samba-server:nightly-centos-amd64
357375
-i ${REPO_BASE}/samba-server:devbuilds-centos-amd64
358376
-i ${REPO_BASE}/samba-ad-server:default-fedora-amd64
359377
-i ${REPO_BASE}/samba-ad-server:default-fedora-arm64
378+
-i ${REPO_BASE}/samba-ad-server:default-opensuse-arm64
360379
-i ${REPO_BASE}/samba-ad-server:nightly-fedora-amd64
361380
-i ${REPO_BASE}/samba-client:default-fedora-amd64
362381
-i ${REPO_BASE}/samba-client:default-fedora-arm64
382+
-i ${REPO_BASE}/samba-client:default-opensuse-arm64
363383
-i ${REPO_BASE}/samba-toolbox:default-fedora-amd64

0 commit comments

Comments
 (0)