From b4be89b9dff4bca08bbac3e8aa69a41e1f2b07a9 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 27 Feb 2025 16:35:16 +0000 Subject: [PATCH] CI: Use a separate tagged Docker image for each dbus branch The image contains build-dependencies from tools/ci-install.sh, so it can be different for 1.16.x vs. main. Include the upstream branch name in the tag name, like we already did for the Windows image, so that an image with the same timestamp but different content can be different. Signed-off-by: Simon McVittie --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d4139d92..88cb84f22 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,19 +69,20 @@ variables: .debian-vars: variables: FDO_DISTRIBUTION_VERSION: 'bookworm-slim' - FDO_DISTRIBUTION_TAG: '2024-10-01.0' # Bump this version on every ci-install.sh or dist version change + # Bump this version on every ci-install.sh or dist version change + FDO_DISTRIBUTION_TAG: "2025-02-27.0-$UPSTREAM_BRANCH" .opensuse-vars: variables: FDO_DISTRIBUTION_VERSION: 'leap' - FDO_DISTRIBUTION_TAG: '2025-02-27.0' # Bump this version on every ci-install.sh or dist version change + FDO_DISTRIBUTION_TAG: "2025-02-27.0-$UPSTREAM_BRANCH" .freebsd-vars: variables: BUILD_OS: freebsd BUILD_ARCH: "x86_64" FDO_DISTRIBUTION_VERSION: '13.1' - FDO_DISTRIBUTION_TAG: '2022-09-21.0' # Bump this version on every ci-install.sh or dist version change + FDO_DISTRIBUTION_TAG: "2025-02-27.0-$UPSTREAM_BRANCH" FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH" .cmake-common: -- 2.47.3