Skip to content

Commit 85832ed

Browse files
BronekBronek
authored
Merge branch 'main' into bthomee/cleanup
2 parents 4160f5b + b30e8e8 commit 85832ed

File tree

5 files changed

+50
-60
lines changed

5 files changed

+50
-60
lines changed

‎.github/workflows/debian.yml‎

Lines changed: 26 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ defaults:
1717
shell: bash
1818

1919
env:
20+
PUSH: ${{ github.event == 'push' && github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
2021
CONTAINER_REGISTRY: ghcr.io
2122
BUILDKIT_PROGRESS: plain
2223
CONAN_VERSION: 2.19.1
@@ -41,6 +42,15 @@ jobs:
4142
- release: bullseye
4243
compiler_name: gcc
4344
compiler_version: 12
45+
- release: bullseye
46+
compiler_name: gcc
47+
compiler_version: 13
48+
- release: bullseye
49+
compiler_name: gcc
50+
compiler_version: 14
51+
- release: bullseye
52+
compiler_name: gcc
53+
compiler_version: 15
4454
- release: bookworm
4555
compiler_name: gcc
4656
compiler_version: 12
@@ -94,41 +104,8 @@ jobs:
94104
PLATFORM=${{ matrix.architecture.platform }}
95105
echo "PLATFORM_PAIR=${PLATFORM//\//-}" >> $GITHUB_ENV
96106
if [ "${{ matrix.os.release == 'bullseye' }}" == "true" ]; then
97-
echo "CONTAINER_REPOSITORY_GCC=${CONTAINER_REPO}/debian-gcc" >> $GITHUB_ENV
98-
echo "CONTAINER_IMAGE_GCC=${CONTAINER_REGISTRY}/${CONTAINER_REPO}/debian-gcc" >> $GITHUB_ENV
107+
echo "CONTAINER_IMAGE_GCC=${CONTAINER_REGISTRY}/${CONTAINER_REPO}/gcc" >> $GITHUB_ENV
99108
fi
100-
- name: Prepare gcc image metadata
101-
if: ${{ env.CONTAINER_IMAGE_GCC }}
102-
id: meta-gcc
103-
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
104-
env:
105-
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,manifest-descriptor
106-
with:
107-
images: ${{ env.CONTAINER_IMAGE_GCC }}
108-
labels: |
109-
org.opencontainers.image.authors=For inquiries, please use https://${{ github.repository }}/issues
110-
org.opencontainers.image.documentation=https://${{ github.repository }}
111-
org.opencontainers.image.vendor=XRPLF
112-
org.opencontainers.image.title=${{ env.CONTAINER_REPOSITORY_GCC }}
113-
- name: Build gcc image
114-
# Note, we always push this image, otherwise steps.build will fail.
115-
# Also, because we always push it, we intentionally do not tag it.
116-
# TODO: Move to separate workflow or job
117-
if: ${{ env.CONTAINER_IMAGE_GCC }}
118-
id: build-gcc
119-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
120-
with:
121-
build-args: |
122-
BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom
123-
BUILDKIT_INLINE_CACHE=1
124-
context: .
125-
file: docker/debian/Dockerfile.gcc-${{ matrix.os.compiler_version }}-${{ matrix.os.release }}
126-
outputs: type=image,name=${{ env.CONTAINER_IMAGE_GCC }},push-by-digest=true,name-canonical=true,push=true
127-
platforms: ${{ matrix.architecture.platform }}
128-
provenance: mode=max
129-
push: true
130-
sbom: true
131-
labels: ${{ steps.meta-gcc.outputs.labels }}
132109
- name: Prepare container metadata
133110
id: meta
134111
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
@@ -158,24 +135,24 @@ jobs:
158135
CMAKE_VERSION=${{ env.CMAKE_VERSION }}
159136
MOLD_VERSION=${{ env.MOLD_VERSION }}
160137
DEBIAN_VERSION=${{ matrix.os.release }}
161-
BASE_IMAGE=${{ env.CONTAINER_IMAGE_GCC && format('{0}@{1}', env.CONTAINER_IMAGE_GCC, steps.build-gcc.outputs.digest) || format('gcc:{0}-{1}', matrix.os.compiler_version, matrix.os.release) }}
138+
BASE_IMAGE=${{ env.CONTAINER_IMAGE_GCC && format('{0}:{1}-{2}', env.CONTAINER_IMAGE_GCC, matrix.os.compiler_version, matrix.os.release) || format('gcc:{0}-{1}', matrix.os.compiler_version, matrix.os.release) }}
162139
context: .
163140
file: docker/debian/Dockerfile
164-
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
141+
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=${{ env.PUSH }}
165142
platforms: ${{ matrix.architecture.platform }}
166143
provenance: mode=max
167-
push: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
144+
push: ${{ env.PUSH }}
168145
sbom: true
169146
labels: ${{ steps.meta.outputs.labels }}
170147
target: ${{ matrix.os.compiler_name }}
171148
- name: Export digest
172-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
149+
if: ${{ env.PUSH }}
173150
run: |
174151
mkdir -p /tmp/digests
175152
DIGEST="${{ steps.build.outputs.digest }}"
176153
touch "/tmp/digests/${DIGEST#sha256:}"
177154
- name: Upload digest
178-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
155+
if: ${{ env.PUSH }}
179156
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
180157
with:
181158
name: digests-${{ matrix.os.release }}-${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-${{ env.PLATFORM_PAIR }}
@@ -184,13 +161,22 @@ jobs:
184161
retention-days: 1
185162

186163
merge:
187-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
164+
if: ${{ github.event == 'push' && github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
188165
strategy:
189166
matrix:
190167
os:
191168
- release: bullseye
192169
compiler_name: gcc
193170
compiler_version: 12
171+
- release: bullseye
172+
compiler_name: gcc
173+
compiler_version: 13
174+
- release: bullseye
175+
compiler_name: gcc
176+
compiler_version: 14
177+
- release: bullseye
178+
compiler_name: gcc
179+
compiler_version: 15
194180
- release: bookworm
195181
compiler_name: gcc
196182
compiler_version: 12

‎.github/workflows/gcc.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ defaults:
1616
shell: bash
1717

1818
env:
19+
PUSH: ${{ github.event == 'push' && github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
1920
CONTAINER_REGISTRY: ghcr.io
2021
BUILDKIT_PROGRESS: plain
2122

@@ -87,19 +88,19 @@ jobs:
8788
context: .
8889
file: docker/gcc/Dockerfile.${{ matrix.os.compiler_version }}-${{ matrix.os.release }}
8990
labels: ${{ steps.meta.outputs.labels }}
90-
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
91+
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=${{ env.PUSH }}
9192
platforms: ${{ matrix.architecture.platform }}
9293
provenance: mode=max
93-
push: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
94+
push: ${{ env.PUSH }}
9495
sbom: true
9596
- name: Export digest
96-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
97+
if: ${{ env.PUSH }}
9798
run: |
9899
mkdir -p /tmp/digests
99100
DIGEST="${{ steps.build.outputs.digest }}"
100101
touch "/tmp/digests/${DIGEST#sha256:}"
101102
- name: Upload digest
102-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
103+
if: ${{ env.PUSH }}
103104
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
104105
with:
105106
name: digests-${{ matrix.os.compiler_version }}-${{ matrix.os.release }}-${{ env.PLATFORM_PAIR }}
@@ -108,7 +109,7 @@ jobs:
108109
retention-days: 1
109110

110111
merge:
111-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
112+
if: ${{ github.event == 'push' && github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
112113
strategy:
113114
matrix:
114115
os:

‎.github/workflows/rhel.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ defaults:
1717
shell: bash
1818

1919
env:
20+
PUSH: ${{ github.event == 'push' && github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
2021
CONTAINER_REGISTRY: ghcr.io
2122
REDHAT_REGISTRY: registry.redhat.io
2223
BUILDKIT_PROGRESS: plain
@@ -120,21 +121,21 @@ jobs:
120121
RHEL_VERSION=${{ matrix.os.release }}
121122
context: .
122123
file: docker/rhel/Dockerfile
123-
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
124+
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=${{ env.PUSH }}
124125
platforms: ${{ matrix.architecture.platform }}
125126
provenance: mode=max
126-
push: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
127+
push: ${{ env.PUSH }}
127128
sbom: true
128129
labels: ${{ steps.meta.outputs.labels }}
129130
target: ${{ matrix.os.compiler_name }}
130131
- name: Export digest
131-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
132+
if: ${{ env.PUSH }}
132133
run: |
133134
mkdir -p /tmp/digests
134135
DIGEST="${{ steps.build.outputs.digest }}"
135136
touch "/tmp/digests/${DIGEST#sha256:}"
136137
- name: Upload digest
137-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
138+
if: ${{ env.PUSH }}
138139
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
139140
with:
140141
name: digests-${{ matrix.os.release }}-${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-${{ env.PLATFORM_PAIR }}
@@ -143,7 +144,7 @@ jobs:
143144
retention-days: 1
144145

145146
merge:
146-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
147+
if: ${{ github.event == 'push' && github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
147148
strategy:
148149
matrix:
149150
os:

‎.github/workflows/tools-rippled.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ defaults:
1616
shell: bash
1717

1818
env:
19+
PUSH: ${{ github.event == 'push' && github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
1920
CONTAINER_REGISTRY: ghcr.io
2021
BUILDKIT_PROGRESS: plain
2122
CMAKE_VERSION: 3.31.6
@@ -91,21 +92,21 @@ jobs:
9192
GRAPHVIZ_VERSION=${{ env.GRAPHVIZ_VERSION }}
9293
PRE_COMMIT_VERSION=${{ env.PRE_COMMIT_VERSION }}
9394
context: docker/tools-rippled
94-
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
95+
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=${{ env.PUSH }}
9596
platforms: ${{ matrix.architecture.platform }}
9697
provenance: mode=max
97-
push: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
98+
push: ${{ env.PUSH }}
9899
sbom: true
99100
labels: ${{ steps.meta.outputs.labels }}
100101
target: ${{ matrix.tool }}
101102
- name: Export digest
102-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
103+
if: ${{ env.PUSH }}
103104
run: |
104105
mkdir -p /tmp/digests
105106
DIGEST="${{ steps.build.outputs.digest }}"
106107
touch "/tmp/digests/${DIGEST#sha256:}"
107108
- name: Upload digest
108-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
109+
if: ${{ env.PUSH }}
109110
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
110111
with:
111112
name: digests-${{ matrix.tool }}-${{ env.PLATFORM_PAIR }}
@@ -114,7 +115,7 @@ jobs:
114115
retention-days: 1
115116

116117
merge:
117-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
118+
if: ${{ github.event == 'push' && github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
118119
strategy:
119120
matrix:
120121
tool:

‎.github/workflows/ubuntu.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ defaults:
1717
shell: bash
1818

1919
env:
20+
PUSH: ${{ github.event == 'push' && github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
2021
CONTAINER_REGISTRY: ghcr.io
2122
BUILDKIT_PROGRESS: plain
2223
CONAN_VERSION: 2.19.1
@@ -116,21 +117,21 @@ jobs:
116117
UBUNTU_VERSION=${{ matrix.os.release }}
117118
context: .
118119
file: docker/ubuntu/Dockerfile
119-
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
120+
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=${{ env.PUSH }}
120121
platforms: ${{ matrix.architecture.platform }}
121122
provenance: mode=max
122-
push: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
123+
push: ${{ env.PUSH }}
123124
sbom: true
124125
labels: ${{ steps.meta.outputs.labels }}
125126
target: ${{ matrix.os.compiler_name }}
126127
- name: Export digest
127-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
128+
if: ${{ env.PUSH }}
128129
run: |
129130
mkdir -p /tmp/digests
130131
DIGEST="${{ steps.build.outputs.digest }}"
131132
touch "/tmp/digests/${DIGEST#sha256:}"
132133
- name: Upload digest
133-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
134+
if: ${{ env.PUSH }}
134135
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
135136
with:
136137
name: digests-${{ matrix.os.release }}-${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-${{ env.PLATFORM_PAIR }}
@@ -139,7 +140,7 @@ jobs:
139140
retention-days: 1
140141

141142
merge:
142-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
143+
if: ${{ github.event == 'push' && github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
143144
strategy:
144145
matrix:
145146
os:

0 commit comments

Comments
 (0)