AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/container: Include DEBIAN_BUILD_TAG in debian/arm64_build

Browse Source 
Unlike other containers (e.g. debian/x86_64_build-base and
debian/x86_64_build), debian/arm64_build is a single-stage image without
a separate -base variant.

Including DEBIAN_BUILD_TAG in its FDO_DISTRIBUTION_TAG ensures it gets
rebuilt when the build tag changes.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12737
Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35000>
This commit is contained in:
Valentine Burley
2025-05-15 14:50:32 +02:00
committed by Marge Bot
parent cc4fd7cc9d
commit 3029898a15
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/container/debian/arm64_build.sh
View File

@@ -1,6 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck disable=SC2086 # we want word splitting # shellcheck disable=SC2086 # we want word splitting
# When changing this file, you need to bump the following
# .gitlab-ci/image-tags.yml tags:
# DEBIAN_BUILD_TAG
set -e set -e
. .gitlab-ci/setup-test-env.sh . .gitlab-ci/setup-test-env.sh

2
.gitlab-ci/container/gitlab-ci.yml
View File

@@ -273,7 +273,7 @@ debian/arm64_build:
tags: tags:
- $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64 - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
variables: variables:
MESA_IMAGE_TAG: &debian-arm64_build "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" MESA_IMAGE_TAG: &debian-arm64_build "${DEBIAN_BUILD_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
LLVM_VERSION: &debian-arm64-llvm 19 LLVM_VERSION: &debian-arm64-llvm 19
.use-debian/arm64_build: .use-debian/arm64_build: