gitlab-ci: clarify names of job classification variables

Name them with `CMAKE_CI_JOB_` prefixes like we do similar variables.
This commit is contained in:
Brad King 2026-01-23 14:37:43 -05:00
parent 9461f0c8e2
commit 98d4e69837
5 changed files with 32 additions and 32 deletions

View File

@ -250,7 +250,7 @@ b:centos8-aarch64:
- .run_manually
variables:
CMAKE_CI_ARTIFACTS_NAME: "artifacts-centos8-aarch64"
CMAKE_CI_NO_MR: "true"
CMAKE_CI_JOB_NO_MR: "true"
t:debian13-ninja:
extends:
@ -272,7 +272,7 @@ t:debian13-aarch64-ninja:
- .run_dependent
- .needs_centos8_aarch64
variables:
CMAKE_CI_NO_MR: "true"
CMAKE_CI_JOB_NO_MR: "true"
t:debian13-ninja-clang:
extends:
@ -1091,7 +1091,7 @@ b:macos-x86_64-ninja:
- .macos_x86_64_tags
- .run_manually
variables:
CMAKE_CI_NO_MR: "true"
CMAKE_CI_JOB_NO_MR: "true"
b:macos-arm64-ninja:
extends:
@ -1132,7 +1132,7 @@ t:macos-x86_64-ninja:
needs:
- b:macos-x86_64-ninja
variables:
CMAKE_CI_NO_MR: "true"
CMAKE_CI_JOB_NO_MR: "true"
t:macos-arm64-ninja:
extends:
@ -1199,7 +1199,7 @@ t:macos-x86_64-xcode:
needs:
- t:macos-x86_64-ninja
variables:
CMAKE_CI_NO_MR: "true"
CMAKE_CI_JOB_NO_MR: "true"
t:macos-arm64-xcode:
extends:
@ -1245,7 +1245,7 @@ t:macos-x86_64-ninja-ub:
needs:
- t:macos-x86_64-ninja
variables:
CMAKE_CI_NO_MR: "true"
CMAKE_CI_JOB_NO_MR: "true"
t:macos-arm64-xcode-ub:
extends:

View File

@ -907,7 +907,7 @@
- .needs_centos7_x86_64
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
CMAKE_CI_NO_MR: "true"
CMAKE_CI_JOB_NO_MR: "true"
.cmake_test_linux_inteloneapi_makefiles:
extends:

View File

@ -90,7 +90,7 @@
variables:
CMAKE_CONFIGURATION: macos_x86_64_xcode
CMAKE_GENERATOR: Xcode
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.macos_arm64_xcode:
extends: .macos
@ -98,7 +98,7 @@
variables:
CMAKE_CONFIGURATION: macos_arm64_xcode
CMAKE_GENERATOR: Xcode
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.macos_arm64_xcode_symlinked:
extends: .macos
@ -106,7 +106,7 @@
variables:
CMAKE_CONFIGURATION: macos_arm64_xcode_symlinked
CMAKE_GENERATOR: Xcode
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_IN_SYMLINK_TREE: 1
CMAKE_CI_BUILD_DIR: "real_work/work/build"
@ -116,7 +116,7 @@
variables:
CMAKE_CONFIGURATION: macos_arm64_xcode_ub
CMAKE_GENERATOR: Xcode
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.macos_arm64_ninja_multi:
extends: .macos
@ -124,14 +124,14 @@
variables:
CMAKE_CONFIGURATION: macos_arm64_ninja_multi
CMAKE_GENERATOR: "Ninja Multi-Config"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.macos_x86_64_ninja_ub:
extends: .macos
variables:
CMAKE_CONFIGURATION: macos_x86_64_ninja_ub
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.macos_arm64_fastbuild:
extends: .macos
@ -139,7 +139,7 @@
variables:
CMAKE_CONFIGURATION: macos_arm64_fastbuild
CMAKE_GENERATOR: FASTBuild
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
## Tags

View File

@ -130,7 +130,7 @@
CMAKE_GENERATOR: "Visual Studio 18 2026"
CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v145,version=14.50.35717"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.windows_vs2022_x64:
extends: .windows
@ -140,7 +140,7 @@
CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.44.35207"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.windows_vs2019_x64:
extends: .windows
@ -150,7 +150,7 @@
CMAKE_GENERATOR: "Visual Studio 16 2019"
CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v142,version=14.29.30133"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.windows_borland:
extends: .windows
@ -158,7 +158,7 @@
variables:
CMAKE_GENERATOR: "Borland Makefiles"
CMAKE_CI_BUILD_TYPE: Release
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.windows_borland5.5:
extends: .windows_borland
@ -178,14 +178,14 @@
variables:
CMAKE_GENERATOR: "Ninja"
CMAKE_CI_BUILD_TYPE: Release
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.windows_ninja_multi:
extends: .windows
variables:
CMAKE_GENERATOR: "Ninja Multi-Config"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.windows_nmake:
extends: .windows
@ -193,7 +193,7 @@
variables:
CMAKE_GENERATOR: "NMake Makefiles"
CMAKE_CI_BUILD_TYPE: Release
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.windows_jom:
extends: .windows
@ -201,7 +201,7 @@
variables:
CMAKE_GENERATOR: "NMake Makefiles JOM"
CMAKE_CI_BUILD_TYPE: Release
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.windows_fastbuild:
extends: .windows
@ -209,7 +209,7 @@
variables:
CMAKE_GENERATOR: "FASTBuild"
CMAKE_CI_BUILD_TYPE: Release
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.windows_vs2026_x64_nmake:
extends:
@ -289,7 +289,7 @@
GIT_CLONE_PATH: "$CI_BUILDS_DIR\\cmake-ci-ext\\$CI_CONCURRENT_ID"
CMAKE_GENERATOR: "Watcom WMake"
CMAKE_CI_BUILD_TYPE: Release
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.windows_openwatcom1.9:
extends: .windows_openwatcom
@ -303,7 +303,7 @@
variables:
CMAKE_GENERATOR: "Ninja"
CMAKE_CI_BUILD_TYPE: Release
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.windows_orangec6.73.1:
extends: .windows_orangec
@ -319,7 +319,7 @@
CMAKE_GENERATOR: "Visual Studio 18 2026"
CMAKE_GENERATOR_PLATFORM: "ARM64"
CMAKE_GENERATOR_TOOLSET: "v145,version=14.50.35717"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.windows_arm64_vs2022:
extends: .windows
@ -329,7 +329,7 @@
CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "ARM64"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.44.35207"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.mingw_osdn_io:
extends: .windows
@ -338,7 +338,7 @@
# Place MinGW environment in a path without spaces.
GIT_CLONE_PATH: "$CI_BUILDS_DIR\\cmake-ci-ext\\$CI_CONCURRENT_ID"
CMAKE_CI_BUILD_TYPE: Debug
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.mingw_osdn_io_mingw_makefiles:
extends: .mingw_osdn_io

View File

@ -13,7 +13,7 @@
- if: '$CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH == $CI_COMMIT_BRANCH && $CMAKE_CI_JOB_CONTINUOUS == "true"'
when: delayed
start_in: 5 minutes
- if: '($CMAKE_CI_NO_MR == "true" && $CI_MERGE_REQUEST_ID)'
- if: '($CMAKE_CI_JOB_NO_MR == "true" && $CI_MERGE_REQUEST_ID)'
when: never
- if: '$CI_MERGE_REQUEST_ID'
when: manual
@ -35,7 +35,7 @@
when: never
- if: '$CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH == $CI_COMMIT_BRANCH && $CMAKE_CI_JOB_CONTINUOUS == "true"'
when: on_success
- if: '($CMAKE_CI_NO_MR == "true" && $CI_MERGE_REQUEST_ID)'
- if: '($CMAKE_CI_JOB_NO_MR == "true" && $CI_MERGE_REQUEST_ID)'
when: never
- if: '$CI_MERGE_REQUEST_ID'
when: on_success
@ -52,7 +52,7 @@
when: never
- if: '($CMAKE_CI_NIGHTLY == "true" && $CMAKE_CI_JOB_NIGHTLY == "false")'
when: never
- if: '($CMAKE_CI_NIGHTLY == "true" && $CMAKE_CI_NIGHTLY_IGNORE_DEPS == "true")'
- if: '($CMAKE_CI_NIGHTLY == "true" && $CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS == "true")'
when: always
- if: '$CMAKE_CI_NIGHTLY == "true"'
when: on_success
@ -60,7 +60,7 @@
when: never
- if: '$CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH == $CI_COMMIT_BRANCH && $CMAKE_CI_JOB_CONTINUOUS == "true"'
when: on_success
- if: '($CMAKE_CI_NO_MR == "true" && $CI_MERGE_REQUEST_ID)'
- if: '($CMAKE_CI_JOB_NO_MR == "true" && $CI_MERGE_REQUEST_ID)'
when: never
- if: '$CI_MERGE_REQUEST_ID'
when: on_success