diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-30 11:26:34 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-30 11:27:56 -0500 |
| commit | e8c6e06815fe17f6035499645524e3b178ce9ebf (patch) | |
| tree | 01f011cee1cd70c172bbd3ff9d02adfdff6425a2 /.gitlab | |
| parent | ebbc3a81715d6b797d6ec8e7462986bc5b8add9f (diff) | |
| download | cmake-e8c6e06815fe17f6035499645524e3b178ce9ebf.tar.gz | |
gitlab-ci: rename tag configuration entries to start in '$os_$arch_tags'
This groups their definitions nicely, and makes their purpose more
clear from reference sites.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/os-linux.yml | 20 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 4 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 10 |
3 files changed, 17 insertions, 17 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 1efd43b8d6..d655e66048 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -374,14 +374,14 @@ ## Tags -.linux_tags: +.linux_x86_64_tags: tags: - cmake - build - docker - linux -.linux_tags_qt: +.linux_x86_64_tags_qt: tags: - cmake - build @@ -389,7 +389,7 @@ - linux - linux-3.17 # Needed to be able to load Fedora's Qt libraries. -.linux_tags_x11: +.linux_x86_64_tags_x11: tags: - cmake - docker @@ -397,7 +397,7 @@ - linux-3.17 # Needed to be able to load Fedora's Qt libraries. - x11 -.linux_tags_cuda: +.linux_x86_64_tags_cuda: tags: - cmake - cuda-rt @@ -411,21 +411,21 @@ - docker - linux-x86_64-v3 -.linux_tags_radeon: +.linux_x86_64_tags_radeon: tags: - cmake - radeon - docker - linux -.linux_tags_aarch64: +.linux_aarch64_tags: tags: - cmake - build - docker - linux-aarch64 -.linux_tags_aarch64_qt: +.linux_aarch64_tags_qt: tags: - cmake - build @@ -591,7 +591,7 @@ extends: - .intelclassic_makefiles - .cmake_test_linux_release - - .linux_tags_qt + - .linux_x86_64_tags_qt - .run_manually - .needs_centos6_x86_64 variables: @@ -601,7 +601,7 @@ extends: - .inteloneapi_makefiles - .cmake_test_linux_release - - .linux_tags_qt + - .linux_x86_64_tags_qt - .run_manually - .needs_centos6_x86_64 variables: @@ -613,7 +613,7 @@ stage: build extends: - .fedora37 - - .linux_tags + - .linux_x86_64_tags - .cmake_org_help_artifacts script: - *before_script_linux diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index e80d625d69..1969ad8aad 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -107,7 +107,7 @@ - nonconcurrent - finder -.macos_x86_64_ext_tags: +.macos_x86_64_tags_ext: tags: - cmake # Since this is a bare runner, pin to a project. - macos @@ -123,7 +123,7 @@ - xcode-14.1 - nonconcurrent -.macos_arm64_ext_tags: +.macos_arm64_tags_ext: tags: - cmake # Since this is a bare runner, pin to a project. - macos-arm64 diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 64b595e694..f1a15202ff 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -273,7 +273,7 @@ ## Tags -.windows_tags_nonconcurrent_vs2022: +.windows_x86_64_tags_nonconcurrent_vs2022: tags: - cmake # Since this is a bare runner, pin to a project. - windows @@ -282,7 +282,7 @@ - msvc-19.34 - nonconcurrent -.windows_tags_nonconcurrent_vs2022_arm64: +.windows_x86_64_tags_nonconcurrent_vs2022_arm64: tags: - cmake # Since this is a bare runner, pin to a project. - windows @@ -291,7 +291,7 @@ - msvc-19.34-arm64 - nonconcurrent -.windows_tags_concurrent_vs2022: +.windows_x86_64_tags_concurrent_vs2022: tags: - cmake # Since this is a bare runner, pin to a project. - windows @@ -300,7 +300,7 @@ - msvc-19.34 - concurrent -.windows_tags_concurrent_vs2019: +.windows_x86_64_tags_concurrent_vs2019: tags: - cmake # Since this is a bare runner, pin to a project. - windows @@ -309,7 +309,7 @@ - msvc-19.29-16.11 - concurrent -.windows_tags_concurrent: +.windows_x86_64_tags_concurrent: tags: - cmake # Since this is a bare runner, pin to a project. - windows |