diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-30 11:17:24 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-30 11:27:35 -0500 |
| commit | ebbc3a81715d6b797d6ec8e7462986bc5b8add9f (patch) | |
| tree | 14e81a958ba84edc07ec39cd8ccd89566e3fe1b8 /.gitlab | |
| parent | 4f905d26bc3340d5c2dff5a64498438e06a5e511 (diff) | |
| download | cmake-ebbc3a81715d6b797d6ec8e7462986bc5b8add9f.tar.gz | |
gitlab-ci: remove unnecessary component of configuration entry names
The '_builder' part of tag entry names is not useful with our current
naming conventions.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/os-linux.yml | 22 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 10 |
2 files changed, 16 insertions, 16 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index f2946c1bd5..1efd43b8d6 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -374,14 +374,14 @@ ## Tags -.linux_builder_tags: +.linux_tags: tags: - cmake - build - docker - linux -.linux_builder_tags_qt: +.linux_tags_qt: tags: - cmake - build @@ -389,7 +389,7 @@ - linux - linux-3.17 # Needed to be able to load Fedora's Qt libraries. -.linux_builder_tags_x11: +.linux_tags_x11: tags: - cmake - docker @@ -397,35 +397,35 @@ - linux-3.17 # Needed to be able to load Fedora's Qt libraries. - x11 -.linux_builder_tags_cuda: +.linux_tags_cuda: tags: - cmake - cuda-rt - docker - linux -.linux_x86_64_v3_builder_tags_cuda: +.linux_x86_64_v3_tags_cuda: tags: - cmake - cuda-rt - docker - linux-x86_64-v3 -.linux_builder_tags_radeon: +.linux_tags_radeon: tags: - cmake - radeon - docker - linux -.linux_builder_tags_aarch64: +.linux_tags_aarch64: tags: - cmake - build - docker - linux-aarch64 -.linux_builder_tags_aarch64_qt: +.linux_tags_aarch64_qt: tags: - cmake - build @@ -591,7 +591,7 @@ extends: - .intelclassic_makefiles - .cmake_test_linux_release - - .linux_builder_tags_qt + - .linux_tags_qt - .run_manually - .needs_centos6_x86_64 variables: @@ -601,7 +601,7 @@ extends: - .inteloneapi_makefiles - .cmake_test_linux_release - - .linux_builder_tags_qt + - .linux_tags_qt - .run_manually - .needs_centos6_x86_64 variables: @@ -613,7 +613,7 @@ stage: build extends: - .fedora37 - - .linux_builder_tags + - .linux_tags - .cmake_org_help_artifacts script: - *before_script_linux diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 4b71a1b965..e80d625d69 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -90,7 +90,7 @@ ## Tags -.macos_x86_64_builder_tags: +.macos_x86_64_tags: tags: - cmake # Since this is a bare runner, pin to a project. - macos @@ -98,7 +98,7 @@ - xcode-14.1 - nonconcurrent -.macos_x86_64_builder_tags_package: +.macos_x86_64_tags_package: tags: - cmake # Since this is a bare runner, pin to a project. - macos @@ -107,7 +107,7 @@ - nonconcurrent - finder -.macos_x86_64_builder_ext_tags: +.macos_x86_64_ext_tags: tags: - cmake # Since this is a bare runner, pin to a project. - macos @@ -115,7 +115,7 @@ - xcode-14.1 - concurrent -.macos_arm64_builder_tags: +.macos_arm64_tags: tags: - cmake # Since this is a bare runner, pin to a project. - macos-arm64 @@ -123,7 +123,7 @@ - xcode-14.1 - nonconcurrent -.macos_arm64_builder_ext_tags: +.macos_arm64_ext_tags: tags: - cmake # Since this is a bare runner, pin to a project. - macos-arm64 |