Skip to content

Commit 61d7253

Browse files
committed
Remove 'Build gcc' step
1 parent 055005a commit 61d7253

File tree

1 file changed

+5
-18
lines changed

1 file changed

+5
-18
lines changed

.github/workflows/debian.yml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ defaults:
1919
env:
2020
CONTAINER_REGISTRY: ghcr.io
2121
BUILDKIT_PROGRESS: plain
22-
LOCAL_GCC_IMAGE: localhost.localdomain/gcc
2322
CONAN_VERSION: 2.19.1
2423
GCOVR_VERSION: 8.3
2524
CMAKE_VERSION: 3.31.6
@@ -93,22 +92,10 @@ jobs:
9392
echo "CONTAINER_IMAGE=${CONTAINER_REGISTRY}/${CONTAINER_REPO}/debian-${{ matrix.os.release }}" >> $GITHUB_ENV
9493
PLATFORM=${{ matrix.architecture.platform }}
9594
echo "PLATFORM_PAIR=${PLATFORM//\//-}" >> $GITHUB_ENV
96-
- name: Build gcc image do not push
97-
if: ${{ matrix.os.release == 'bullseye' }}
98-
id: build-gcc
99-
uses: docker/build-push-action@v6
100-
with:
101-
build-args: |
102-
BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom
103-
BUILDKIT_INLINE_CACHE=1
104-
context: .
105-
file: docker/debian/Dockerfile.gcc-${{ matrix.os.compiler_version }}-${{ matrix.os.release }}
106-
outputs: type=image,name=${{ env.LOCAL_GCC_IMAGE }},push=false
107-
platforms: ${{ matrix.architecture.platform }}
108-
provenance: mode=max
109-
push: false
110-
sbom: true
111-
tags: ${{ format('{0}:{1}-{2}', env.LOCAL_GCC_IMAGE, matrix.os.compiler_version, matrix.os.release) }}
95+
if [ -n "${{ matrix.os.release == 'bullseye' && 'latch' }}" ]; then
96+
echo "CONTAINER_REPOSITORY_GCC=${CONTAINER_REPO}/debian-gcc" >> $GITHUB_ENV
97+
echo "CONTAINER_IMAGE_GCC=${CONTAINER_REGISTRY}/${CONTAINER_REPO}/debian-gcc" >> $GITHUB_ENV
98+
fi
11299
- name: Prepare container metadata
113100
id: meta
114101
uses: docker/metadata-action@v5
@@ -137,7 +124,7 @@ jobs:
137124
GCOVR_VERSION=${{ env.GCOVR_VERSION }}
138125
CMAKE_VERSION=${{ env.CMAKE_VERSION }}
139126
DEBIAN_VERSION=${{ matrix.os.release }}
140-
BASE_IMAGE=${{ matrix.os.release == 'bullseye' && format('{0}@{1}', env.LOCAL_GCC_IMAGE, steps.build-gcc.outputs.digest) || format('gcc:{0}-{1}', matrix.os.compiler_version, matrix.os.release) }}
127+
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) }}
141128
context: .
142129
file: docker/debian/Dockerfile
143130
outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true

0 commit comments

Comments
 (0)