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 <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2025-02-27 16:35:16 +00:00
parent 149165840d
commit b4be89b9df

View file

@ -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: