gitlab-ci: Move 'image:' from deprecated global to .default
This commit is contained in:
parent
18079e176f
commit
876c709a29
1 changed files with 9 additions and 6 deletions
|
|
@ -23,9 +23,6 @@
|
|||
# - GIMP_CI_WIN_INSTALLER: trigger all native MSYS2 builds then creates Inno Windows installer.
|
||||
# - GIMP_CI_CPPCHECK: trigger cppcheck static analysis.
|
||||
|
||||
|
||||
image: debian:bookworm
|
||||
|
||||
stages:
|
||||
- prepare
|
||||
- dependencies
|
||||
|
|
@ -34,8 +31,10 @@ stages:
|
|||
- distribution
|
||||
- analysis
|
||||
|
||||
# GitLab "default:" is buggy so let's use extensions and references
|
||||
|
||||
.default:
|
||||
# Default Docker image (unless otherwise defined)
|
||||
image: debian:bookworm
|
||||
# Caching support
|
||||
variables:
|
||||
CCACHE_BASEDIR: "$CI_PROJECT_DIR"
|
||||
|
|
@ -66,7 +65,8 @@ variables:
|
|||
ARTIFACTS_SUFFIX: "-x64"
|
||||
GIMP_PREFIX: "${CI_PROJECT_DIR}/_install${ARTIFACTS_SUFFIX}"
|
||||
|
||||
## prepare docker images ##
|
||||
|
||||
## prepare build-oriented Docker images ##
|
||||
|
||||
image-debian-x64:
|
||||
rules:
|
||||
|
|
@ -719,9 +719,10 @@ dev-docs:
|
|||
- if: '$CI_COMMIT_TAG != null'
|
||||
needs: ["deps-debian-x64", "gimp-debian-x64"]
|
||||
stage: distribution
|
||||
image: $CI_REGISTRY_IMAGE:build-debian-latest
|
||||
cache: []
|
||||
script:
|
||||
- apt-get update
|
||||
- apt-get install -y xz-utils
|
||||
- BABL_VER=$(grep BABL_VERSION _babl/_build${ARTIFACTS_SUFFIX}/config.h | head -1 | sed 's/^.*"\([^"]*\)"$/\1/') &&
|
||||
BABL_API_VER=$(grep BABL_API_VERSION _babl/_build${ARTIFACTS_SUFFIX}/config.h | head -1 | sed 's/^.*"\([^"]*\)"$/\1/') &&
|
||||
DIR_NAME=babl-api-docs-$BABL_VER &&
|
||||
|
|
@ -795,10 +796,12 @@ dist-installer-weekly:
|
|||
## Analysis ##
|
||||
|
||||
clang-format:
|
||||
extends: .default
|
||||
only:
|
||||
- merge_requests
|
||||
needs: []
|
||||
stage: analysis
|
||||
cache: []
|
||||
script:
|
||||
- apt-get update
|
||||
- apt-get install -y clang-format
|
||||
|
|
|
|||
Loading…
Reference in a new issue