Skip to content

Commit 8502b4f

Browse files
bthomeebthomee
committed
Add runner to matrix to unblock GitHub
1 parent 6e59a7a commit 8502b4f

File tree

3 files changed

+89
-83
lines changed

3 files changed

+89
-83
lines changed

‎.github/workflows/debian.yml‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,37 @@ jobs:
1818
build:
1919
strategy:
2020
matrix:
21-
platform:
22-
- os: bookworm
23-
compiler: gcc
24-
version: 12
25-
- os: bookworm
26-
compiler: gcc
27-
version: 13
28-
- os: bookworm
29-
compiler: gcc
30-
version: 14
31-
- os: bookworm
32-
compiler: clang
33-
version: 16
34-
- os: bookworm
35-
compiler: clang
36-
version: 17
37-
- os: bookworm
38-
compiler: clang
39-
version: 18
40-
- os: bookworm
41-
compiler: clang
42-
version: 19
43-
- os: bookworm
44-
compiler: clang
45-
version: 20
4621
architecture:
47-
- linux/amd64
48-
- linux/arm64
49-
runs-on: ubuntu-24.04${{ matrix.architecture == 'linux/arm64' && '-arm' || '' }}
22+
- platform: linux/amd64
23+
runner: ubuntu-24.04
24+
- platform: linux/arm64
25+
runner: ubuntu-24.04-arm
26+
os:
27+
- distro: bookworm
28+
compiler_name: gcc
29+
compiler_version: 12
30+
- distro: bookworm
31+
compiler_name: gcc
32+
compiler_version: 13
33+
- distro: bookworm
34+
compiler_name: gcc
35+
compiler_version: 14
36+
- distro: bookworm
37+
compiler_name: clang
38+
compiler_version: 16
39+
- distro: bookworm
40+
compiler_name: clang
41+
compiler_version: 17
42+
- distro: bookworm
43+
compiler_name: clang
44+
compiler_version: 18
45+
- distro: bookworm
46+
compiler_name: clang
47+
compiler_version: 19
48+
- distro: bookworm
49+
compiler_name: clang
50+
compiler_version: 20
51+
runs-on: ${{ matrix.architecture.runner }}
5052
steps:
5153
- name: Checkout repository
5254
uses: actions/checkout@v4
@@ -66,24 +68,24 @@ jobs:
6668
# uppercase, which is not permitted by the Docker registry.
6769
GITHUB_REPO=${{ github.repository }}
6870
CONTAINER_REPOSITORY=${GITHUB_REPO@L}
69-
echo "CONTAINER_IMAGE=${CONTAINER_REGISTRY}/${CONTAINER_REPOSITORY}/debian-${{ matrix.platform.os }}:${{ matrix.platform.compiler }}${{ matrix.platform.version }}" >> $GITHUB_ENV
71+
echo "CONTAINER_IMAGE=${CONTAINER_REGISTRY}/${CONTAINER_REPOSITORY}/debian-${{ matrix.os.distro }}:${{ matrix.os.compiler_name }}${{ matrix.os.compiler_version }}" >> $GITHUB_ENV
7072
- name: Build and push the Docker image
7173
uses: docker/build-push-action@v6
7274
with:
7375
build-args: |
7476
BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom
7577
BUILDKIT_INLINE_CACHE=1
76-
CLANG_VERSION=${{ matrix.platform.compiler == 'clang' && matrix.platform.version || '' }}
78+
CLANG_VERSION=${{ matrix.os.compiler_name == 'clang' && matrix.os.compiler_version || '' }}
7779
CONAN_VERSION=${{ env.CONAN_VERSION }}
78-
DEBIAN_VERSION=${{ matrix.platform.os }}
79-
GCC_VERSION=${{ matrix.platform.compiler == 'gcc' && matrix.platform.version || '' }}
80+
DEBIAN_VERSION=${{ matrix.os.distro }}
81+
GCC_VERSION=${{ matrix.os.compiler_name == 'gcc' && matrix.os.compiler_version || '' }}
8082
GITHUB_REPO=${{ github.repository }}
8183
NONROOT_USER=${{ env.NONROOT_USER }}
8284
context: docker/debian
8385
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
84-
platforms: ${{ matrix.architecture }}
86+
platforms: ${{ matrix.architecture.platform }}
8587
provenance: mode=max
8688
push: true
8789
sbom: true
8890
tags: ${{ env.CONTAINER_IMAGE }}
89-
target: ${{ matrix.platform.compiler }}
91+
target: ${{ matrix.os.compiler_name }}

‎.github/workflows/rhel.yml‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,22 @@ jobs:
2020
gcc:
2121
strategy:
2222
matrix:
23-
platform:
24-
- os: 9.6
25-
compiler: gcc
26-
version: 13
27-
- os: 9.6
28-
compiler: gcc
29-
version: 14
30-
- os: 9.6
31-
compiler: clang
32-
version: ''
3323
architecture:
34-
- linux/amd64
35-
- linux/arm64
36-
runs-on: ubuntu-24.04${{ matrix.architecture == 'linux/arm64' && '-arm' || '' }}
24+
- platform: linux/amd64
25+
runner: ubuntu-24.04
26+
- platform: linux/arm64
27+
runner: ubuntu-24.04-arm
28+
os:
29+
- distro: 9.6
30+
compiler_name: gcc
31+
compiler_version: 13
32+
- distro: 9.6
33+
compiler_name: gcc
34+
compiler_version: 14
35+
- distro: 9.6
36+
compiler_name: clang
37+
compiler_version: ''
38+
runs-on: ${{ matrix.architecture.runner }}
3739
steps:
3840
- name: Checkout repository
3941
uses: actions/checkout@v4
@@ -59,23 +61,23 @@ jobs:
5961
# uppercase, which is not permitted by the Docker registry.
6062
GITHUB_REPO=${{ github.repository }}
6163
CONTAINER_REPOSITORY=${GITHUB_REPO@L}
62-
echo "CONTAINER_IMAGE=${CONTAINER_REGISTRY}/${CONTAINER_REPOSITORY}/rhel-${{ matrix.platform.os }}:${{ matrix.platform.compiler }}${{ matrix.platform.version }}" >> $GITHUB_ENV
64+
echo "CONTAINER_IMAGE=${CONTAINER_REGISTRY}/${CONTAINER_REPOSITORY}/rhel-${{ matrix.os.distro }}:${{ matrix.os.compiler_name }}${{ matrix.os.compiler_version }}" >> $GITHUB_ENV
6365
- name: Build and push the Docker image
6466
uses: docker/build-push-action@v6
6567
with:
6668
build-args: |
6769
BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom
6870
BUILDKIT_INLINE_CACHE=1
6971
CONAN_VERSION=${{ env.CONAN_VERSION }}
70-
GCC_VERSION=${{ matrix.platform.compiler == 'gcc' && matrix.platform.version || '' }}
72+
GCC_VERSION=${{ matrix.os.compiler_name == 'gcc' && matrix.os.compiler_version || '' }}
7173
GITHUB_REPO=${{ github.repository }}
7274
NONROOT_USER=${{ env.NONROOT_USER }}
73-
RHEL_VERSION=${{ matrix.version.os }}
75+
RHEL_VERSION=${{ matrix.os.distro }}
7476
context: docker/rhel
7577
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
76-
platforms: ${{ matrix.architecture }}
78+
platforms: ${{ matrix.architecture.platform }}
7779
provenance: mode=max
7880
push: true
7981
sbom: true
8082
tags: ${{ env.CONTAINER_IMAGE }}
81-
target: ${{ matrix.platform.compiler }}
83+
target: ${{ matrix.os.compiler_name }}

‎.github/workflows/ubuntu.yml‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,34 @@ jobs:
1919
gcc:
2020
strategy:
2121
matrix:
22-
platform:
23-
- os: jammy
24-
compiler: gcc
25-
version: 12
26-
- os: noble
27-
compiler: gcc
28-
version: 13
29-
- os: noble
30-
compiler: gcc
31-
version: 14
32-
- os: noble
33-
compiler: clang
34-
version: 16
35-
- os: noble
36-
compiler: clang
37-
version: 17
38-
- os: noble
39-
compiler: clang
40-
version: 18
41-
- os: noble
42-
compiler: clang
43-
version: 19
4422
architecture:
45-
- linux/amd64
46-
- linux/arm64
47-
runs-on: ubuntu-24.04${{ matrix.architecture == 'linux/arm64' && '-arm' || '' }}
23+
- platform: linux/amd64
24+
runner: ubuntu-24.04
25+
- platform: linux/arm64
26+
runner: ubuntu-24.04-arm
27+
os:
28+
- distro: jammy
29+
compiler_name: gcc
30+
compiler_version: 12
31+
- distro: noble
32+
compiler_name: gcc
33+
compiler_version: 13
34+
- distro: noble
35+
compiler_name: gcc
36+
compiler_version: 14
37+
- distro: noble
38+
compiler_name: clang
39+
compiler_version: 16
40+
- distro: noble
41+
compiler_name: clang
42+
compiler_version: 17
43+
- distro: noble
44+
compiler_name: clang
45+
compiler_version: 18
46+
- distro: noble
47+
compiler_name: clang
48+
compiler_version: 19
49+
runs-on: ${{ matrix.architecture.runner }}
4850
steps:
4951
- name: Checkout repository
5052
uses: actions/checkout@v4
@@ -64,24 +66,24 @@ jobs:
6466
# uppercase, which is not permitted by the Docker registry.
6567
GITHUB_REPO=${{ github.repository }}
6668
CONTAINER_REPOSITORY=${GITHUB_REPO@L}
67-
echo "CONTAINER_IMAGE=${CONTAINER_REGISTRY}/${CONTAINER_REPOSITORY}/ubuntu-${{ matrix.platform.os }}:${{ matrix.platform.compiler }}${{ matrix.platform.version }}" >> $GITHUB_ENV
69+
echo "CONTAINER_IMAGE=${CONTAINER_REGISTRY}/${CONTAINER_REPOSITORY}/ubuntu-${{ matrix.os.distro }}:${{ matrix.os.compiler_name }}${{ matrix.os.compiler_version }}" >> $GITHUB_ENV
6870
- name: Build and push the Docker image
6971
uses: docker/build-push-action@v6
7072
with:
7173
build-args: |
7274
BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom
7375
BUILDKIT_INLINE_CACHE=1
74-
CLANG_VERSION=${{ matrix.platform.compiler == 'clang' && matrix.platform.version || '' }}
76+
CLANG_VERSION=${{ matrix.os.compiler_name == 'clang' && matrix.os.compiler_version || '' }}
7577
CONAN_VERSION=${{ env.CONAN_VERSION }}
76-
GCC_VERSION=${{ matrix.platform.compiler == 'gcc' && matrix.platform.version || '' }}
78+
GCC_VERSION=${{ matrix.os.compiler_name == 'gcc' && matrix.os.compiler_version || '' }}
7779
GITHUB_REPO=${{ github.repository }}
7880
NONROOT_USER=${{ env.NONROOT_USER }}
79-
UBUNTU_VERSION=${{ matrix.platform.os }}
81+
UBUNTU_VERSION=${{ matrix.os.distro }}
8082
context: docker/ubuntu
8183
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
82-
platforms: ${{ matrix.architecture }}
84+
platforms: ${{ matrix.architecture.platform }}
8385
provenance: mode=max
8486
push: true
8587
sbom: true
8688
tags: ${{ env.CONTAINER_IMAGE }}
87-
target: ${{ matrix.platform.compiler }}
89+
target: ${{ matrix.os.compiler_name }}

0 commit comments

Comments
 (0)