summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml142
-rw-r--r--.gitlab/os-linux.yml43
-rw-r--r--.gitlab/os-macos.yml16
-rw-r--r--.gitlab/os-windows.yml20
4 files changed, 102 insertions, 119 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa477a7fe4..a2b3ec338a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,7 +49,7 @@ p:source-package:
extends:
- .linux_prep_source
- .cmake_prep_source_linux
- - .linux_builder_tags
+ - .linux_x86_64_tags
- .cmake_release_artifacts
- .run_only_for_package
variables:
@@ -59,7 +59,7 @@ p:doc-package:
extends:
- .fedora37_sphinx_package
- .cmake_prep_doc_linux
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .cmake_doc_artifacts
- .run_only_for_package
@@ -95,28 +95,28 @@ u:cmake.org-help:
l:codespell:
extends:
- .cmake_codespell_linux
- - .linux_builder_tags
+ - .linux_x86_64_tags
- .run_automatically
l:iwyu-debian10:
extends:
- .debian10_iwyu
- .cmake_build_linux
- - .linux_builder_tags
+ - .linux_x86_64_tags
- .run_automatically
l:tidy-fedora37:
extends:
- .fedora37_tidy
- .cmake_build_linux
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .run_automatically
l:sphinx-fedora37:
extends:
- .fedora37_sphinx
- .cmake_build_linux
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .run_automatically
variables:
CMAKE_CI_JOB_CONTINUOUS: "true"
@@ -126,7 +126,7 @@ l:clang-analyzer-fedora37:
extends:
- .fedora37_clang_analyzer
- .cmake_build_linux
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .run_automatically
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
@@ -138,7 +138,7 @@ b:centos6-x86_64:
- .linux_release_x86_64
- .cmake_build_linux_release
- .cmake_release_artifacts
- - .linux_builder_tags
+ - .linux_x86_64_tags
- .run_manually
variables:
CMAKE_CI_ARTIFACTS_NAME: "artifacts-centos6-x86_64"
@@ -148,7 +148,7 @@ b:centos7-aarch64:
- .linux_release_aarch64
- .cmake_build_linux_release
- .cmake_release_artifacts
- - .linux_builder_tags_aarch64
+ - .linux_aarch64_tags
- .run_manually
variables:
CMAKE_CI_ARTIFACTS_NAME: "artifacts-centos7-aarch64"
@@ -158,7 +158,7 @@ t:debian10-ninja:
extends:
- .debian10_ninja
- .cmake_test_linux_release
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .cmake_junit_artifacts
- .run_dependent
- .needs_centos6_x86_64
@@ -169,7 +169,7 @@ t:debian10-aarch64-ninja:
extends:
- .debian10_aarch64_ninja
- .cmake_test_linux_release
- - .linux_builder_tags_aarch64_qt
+ - .linux_aarch64_tags
- .cmake_junit_artifacts
- .run_dependent
- .needs_centos7_aarch64
@@ -180,7 +180,7 @@ t:debian10-ninja-clang:
extends:
- .debian10_ninja_clang
- .cmake_test_linux_release
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .run_dependent
- .needs_centos6_x86_64
variables:
@@ -190,7 +190,7 @@ t:debian10-makefiles-clang:
extends:
- .debian10_makefiles_clang
- .cmake_test_linux_release
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .run_dependent
- .needs_centos6_x86_64
variables:
@@ -200,7 +200,7 @@ t:fedora37-ninja-clang:
extends:
- .fedora37_ninja_clang
- .cmake_test_linux_release
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .run_dependent
- .needs_centos6_x86_64
variables:
@@ -210,7 +210,7 @@ t:fedora37-makefiles-clang:
extends:
- .fedora37_makefiles_clang
- .cmake_test_linux_release
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .run_dependent
- .needs_centos6_x86_64
variables:
@@ -220,7 +220,7 @@ t:fedora37-makefiles:
extends:
- .fedora37_makefiles
- .cmake_test_linux_release
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .run_dependent
- .needs_centos6_x86_64
@@ -228,7 +228,7 @@ t:fedora37-makefiles-nospace:
extends:
- .fedora37_makefiles
- .cmake_test_linux_release
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .cmake_junit_artifacts
- .run_dependent
- .needs_centos6_x86_64
@@ -241,7 +241,7 @@ t:nvhpc22.9-ninja:
extends:
- .nvhpc_ninja
- .cmake_test_linux_release
- - .linux_x86_64_v3_builder_tags_cuda
+ - .linux_x86_64_v3_tags_cuda
- .run_dependent
- .needs_centos6_x86_64
variables:
@@ -251,7 +251,7 @@ t:cuda9.2-nvidia:
extends:
- .cuda9.2_nvidia
- .cmake_test_linux_release
- - .linux_builder_tags_cuda
+ - .linux_x86_64_tags_cuda
- .run_dependent
- .needs_centos6_x86_64
variables:
@@ -261,7 +261,7 @@ t:cuda10.2-nvidia:
extends:
- .cuda10.2_nvidia
- .cmake_test_linux_release
- - .linux_builder_tags_cuda
+ - .linux_x86_64_tags_cuda
- .cmake_junit_artifacts
- .run_dependent
- .needs_centos6_x86_64
@@ -270,7 +270,7 @@ t:cuda10.2-clang:
extends:
- .cuda10.2_clang
- .cmake_test_linux_release
- - .linux_builder_tags_cuda
+ - .linux_x86_64_tags_cuda
- .run_dependent
- .needs_centos6_x86_64
variables:
@@ -280,7 +280,7 @@ t:cuda11.6-nvidia:
extends:
- .cuda11.6_nvidia
- .cmake_test_linux_release
- - .linux_builder_tags_cuda
+ - .linux_x86_64_tags_cuda
- .cmake_junit_artifacts
- .run_dependent
- .needs_centos6_x86_64
@@ -289,7 +289,7 @@ t:cuda11.6-clang:
extends:
- .cuda11.6_clang
- .cmake_test_linux_release
- - .linux_builder_tags_cuda
+ - .linux_x86_64_tags_cuda
- .run_dependent
- .needs_centos6_x86_64
variables:
@@ -299,7 +299,7 @@ t:hip4.2-radeon:
extends:
- .hip4.2_radeon
- .cmake_test_linux_release
- - .linux_builder_tags_radeon
+ - .linux_x86_64_tags_radeon
- .run_dependent
- .needs_centos6_x86_64
variables:
@@ -309,7 +309,7 @@ t:linux-gcc-cxx-modules-ninja:
extends:
- .gcc_cxx_modules_ninja
- .cmake_test_linux_release
- - .linux_builder_tags
+ - .linux_x86_64_tags
- .run_dependent
- .needs_centos6_x86_64
variables:
@@ -319,7 +319,7 @@ t:linux-gcc-cxx-modules-ninja-multi:
extends:
- .gcc_cxx_modules_ninja_multi
- .cmake_test_linux_release
- - .linux_builder_tags
+ - .linux_x86_64_tags
- .run_dependent
- .needs_centos6_x86_64
variables:
@@ -330,7 +330,7 @@ b:fedora37-ninja:
- .fedora37_ninja
- .cmake_build_linux
- .cmake_build_artifacts
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .run_manually
variables:
CMAKE_CI_JOB_CONTINUOUS: "true"
@@ -339,7 +339,7 @@ b:debian10-makefiles-inplace:
extends:
- .debian10_makefiles_inplace
- .cmake_build_linux_standalone
- - .linux_builder_tags
+ - .linux_x86_64_tags
- .run_manually
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
@@ -348,7 +348,7 @@ b:debian10-extdeps:
extends:
- .debian10_extdeps
- .cmake_build_linux_standalone
- - .linux_builder_tags
+ - .linux_x86_64_tags
- .run_manually
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
@@ -357,7 +357,7 @@ b:debian10-aarch64-extdeps:
extends:
- .debian10_aarch64_extdeps
- .cmake_build_linux_standalone
- - .linux_builder_tags_aarch64
+ - .linux_aarch64_tags
- .run_manually
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
@@ -366,7 +366,7 @@ b:fedora37-extdeps:
extends:
- .fedora37_extdeps
- .cmake_build_linux_standalone
- - .linux_builder_tags
+ - .linux_x86_64_tags
- .run_manually
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
@@ -375,7 +375,7 @@ t:fedora37-ninja:
extends:
- .fedora37_ninja
- .cmake_test_linux
- - .linux_builder_tags_x11
+ - .linux_x86_64_tags_x11
- .cmake_test_artifacts
- .run_dependent
dependencies:
@@ -389,7 +389,7 @@ t:fedora37-ninja-multi:
extends:
- .fedora37_ninja_multi
- .cmake_test_linux_external
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -690,7 +690,7 @@ b:linux-x86_64-package:
- .linux_release_x86_64
- .cmake_build_linux_release
- .cmake_release_artifacts
- - .linux_builder_tags
+ - .linux_x86_64_tags
- .run_only_for_package
dependencies:
- p:doc-package
@@ -714,7 +714,7 @@ b:linux-aarch64-package:
- .linux_release_aarch64
- .cmake_build_linux_release
- .cmake_release_artifacts
- - .linux_builder_tags_aarch64
+ - .linux_aarch64_tags
- .run_only_for_package
dependencies:
- p:doc-package
@@ -739,7 +739,7 @@ b:fedora37-asan:
- .fedora37_asan
- .cmake_build_linux
- .cmake_build_artifacts
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .run_manually
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
@@ -748,7 +748,7 @@ t:fedora37-asan:
extends:
- .fedora37_asan
- .cmake_memcheck_linux
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .run_dependent
dependencies:
- b:fedora37-asan
@@ -764,7 +764,7 @@ b:macos-x86_64-ninja:
- .macos_x86_64_ninja
- .cmake_build_macos
- .cmake_build_artifacts
- - .macos_x86_64_builder_tags
+ - .macos_x86_64_tags
- .run_manually
variables:
CMAKE_CI_JOB_CONTINUOUS: "true"
@@ -774,7 +774,7 @@ b:macos-arm64-ninja:
- .macos_arm64_ninja
- .cmake_build_macos
- .cmake_build_artifacts
- - .macos_arm64_builder_tags
+ - .macos_arm64_tags
- .run_manually
variables:
CMAKE_CI_NO_MR: "true"
@@ -784,7 +784,7 @@ t:macos-x86_64-ninja:
- .macos_x86_64_ninja
- .cmake_test_macos
- .cmake_test_artifacts
- - .macos_x86_64_builder_tags
+ - .macos_x86_64_tags
- .run_dependent
dependencies:
- b:macos-x86_64-ninja
@@ -799,7 +799,7 @@ t:macos-arm64-ninja:
- .macos_arm64_ninja
- .cmake_test_macos
- .cmake_test_artifacts
- - .macos_arm64_builder_tags
+ - .macos_arm64_tags
- .run_dependent
dependencies:
- b:macos-arm64-ninja
@@ -813,14 +813,14 @@ b:macos-x86_64-makefiles:
- .macos_x86_64_makefiles
- .cmake_build_macos
- .cmake_build_artifacts
- - .macos_x86_64_builder_tags
+ - .macos_x86_64_tags
- .run_manually
t:macos-x86_64-makefiles:
extends:
- .macos_x86_64_makefiles
- .cmake_test_macos
- - .macos_x86_64_builder_tags
+ - .macos_x86_64_tags
- .run_dependent
dependencies:
- b:macos-x86_64-makefiles
@@ -831,7 +831,7 @@ t:macos-x86_64-ninja-multi:
extends:
- .macos_x86_64_ninja_multi
- .cmake_test_macos_external
- - .macos_x86_64_builder_ext_tags
+ - .macos_x86_64_tags_ext
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -845,7 +845,7 @@ t:macos-x86_64-xcode:
extends:
- .macos_x86_64_xcode
- .cmake_test_macos_external
- - .macos_x86_64_builder_ext_tags
+ - .macos_x86_64_tags_ext
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -857,7 +857,7 @@ t:macos-arm64-xcode:
extends:
- .macos_arm64_xcode
- .cmake_test_macos_external
- - .macos_arm64_builder_ext_tags
+ - .macos_arm64_tags_ext
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -872,7 +872,7 @@ b:macos-package:
- .macos_package
- .cmake_build_macos_package
- .cmake_release_artifacts
- - .macos_x86_64_builder_tags_package
+ - .macos_x86_64_tags_package
- .run_only_for_package
dependencies:
- p:doc-package
@@ -895,7 +895,7 @@ b:macos10.10-package:
- .macos10.10_package
- .cmake_build_macos_package
- .cmake_release_artifacts
- - .macos_x86_64_builder_tags_package
+ - .macos_x86_64_tags_package
- .run_only_for_package
dependencies:
- p:doc-package
@@ -920,14 +920,14 @@ b:windows-vs2022-x64-ninja:
- .windows_vs2022_x64_ninja
- .cmake_build_windows
- .cmake_build_artifacts
- - .windows_tags_nonconcurrent_vs2022
+ - .windows_x86_64_tags_nonconcurrent_vs2022
- .run_manually
t:windows-vs2022-x64-ninja:
extends:
- .windows_vs2022_x64_ninja
- .cmake_test_windows
- - .windows_tags_nonconcurrent_vs2022
+ - .windows_x86_64_tags_nonconcurrent_vs2022
- .cmake_test_artifacts
- .run_dependent
dependencies:
@@ -941,7 +941,7 @@ t:windows-vs2022-x64-ninja-multi:
extends:
- .windows_vs2022_x64_ninja_multi
- .cmake_test_windows_external
- - .windows_tags_concurrent_vs2022
+ - .windows_x86_64_tags_concurrent_vs2022
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -955,7 +955,7 @@ t:windows-vs2022-x64:
extends:
- .windows_vs2022_x64
- .cmake_test_windows_external
- - .windows_tags_concurrent_vs2022
+ - .windows_x86_64_tags_concurrent_vs2022
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -967,7 +967,7 @@ t:windows-vs2019-x64:
extends:
- .windows_vs2019_x64
- .cmake_test_windows_external
- - .windows_tags_concurrent_vs2019
+ - .windows_x86_64_tags_concurrent_vs2019
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -981,7 +981,7 @@ t:windows-vs2022-x64-nmake:
extends:
- .windows_vs2022_x64_nmake
- .cmake_test_windows_nmake
- - .windows_tags_concurrent_vs2022
+ - .windows_x86_64_tags_concurrent_vs2022
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -995,7 +995,7 @@ t:windows-vs2022-x64-jom:
extends:
- .windows_vs2022_x64_jom
- .cmake_test_windows_jom
- - .windows_tags_concurrent_vs2022
+ - .windows_x86_64_tags_concurrent_vs2022
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -1009,7 +1009,7 @@ t:windows-borland5.5:
extends:
- .windows_borland5.5
- .cmake_test_windows_borland
- - .windows_tags_concurrent
+ - .windows_x86_64_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -1023,7 +1023,7 @@ t:windows-borland5.8:
extends:
- .windows_borland5.8
- .cmake_test_windows_borland
- - .windows_tags_concurrent
+ - .windows_x86_64_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -1037,7 +1037,7 @@ t:windows-clang15.0-cl-ninja:
extends:
- .windows_clang_ninja
- .cmake_test_windows_external
- - .windows_tags_concurrent
+ - .windows_x86_64_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -1052,7 +1052,7 @@ t:windows-clang15.0-cl-nmake:
extends:
- .windows_clang_nmake
- .cmake_test_windows_external
- - .windows_tags_concurrent
+ - .windows_x86_64_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -1067,7 +1067,7 @@ t:windows-clang15.0-gnu-ninja:
extends:
- .windows_clang_ninja
- .cmake_test_windows_external
- - .windows_tags_concurrent
+ - .windows_x86_64_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -1082,7 +1082,7 @@ t:windows-clang15.0-gnu-nmake:
extends:
- .windows_clang_nmake
- .cmake_test_windows_external
- - .windows_tags_concurrent
+ - .windows_x86_64_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -1097,7 +1097,7 @@ t:mingw_osdn_io-mingw_makefiles:
extends:
- .mingw_osdn_io_mingw_makefiles
- .cmake_test_windows_external
- - .windows_tags_concurrent
+ - .windows_x86_64_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -1111,7 +1111,7 @@ t:mingw_osdn_io-msys_makefiles:
extends:
- .mingw_osdn_io_msys_makefiles
- .cmake_test_windows_external
- - .windows_tags_concurrent
+ - .windows_x86_64_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -1125,7 +1125,7 @@ t:windows-msvc-v71-nmake:
extends:
- .windows_msvc_v71_nmake
- .cmake_test_windows_msvc
- - .windows_tags_concurrent
+ - .windows_x86_64_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -1139,7 +1139,7 @@ t:windows-openwatcom1.9:
extends:
- .windows_openwatcom1.9
- .cmake_test_windows_openwatcom
- - .windows_tags_concurrent
+ - .windows_x86_64_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -1196,7 +1196,7 @@ b:windows-x86_64-package:
- .windows_x86_64_package
- .cmake_build_windows
- .cmake_build_package_artifacts
- - .windows_tags_nonconcurrent_vs2022
+ - .windows_x86_64_tags_nonconcurrent_vs2022
- .run_only_for_package
dependencies:
- p:doc-package
@@ -1210,7 +1210,7 @@ k:windows-x86_64-package:
- .windows_x86_64_package
- .cmake_package_windows
- .cmake_release_artifacts
- - .windows_tags_nonconcurrent_vs2022
+ - .windows_x86_64_tags_nonconcurrent_vs2022
- .run_only_for_package
dependencies:
- b:windows-x86_64-package
@@ -1233,7 +1233,7 @@ b:windows-i386-package:
- .windows_i386_package
- .cmake_build_windows
- .cmake_build_package_artifacts
- - .windows_tags_nonconcurrent_vs2022
+ - .windows_x86_64_tags_nonconcurrent_vs2022
- .run_only_for_package
dependencies:
- p:doc-package
@@ -1247,7 +1247,7 @@ k:windows-i386-package:
- .windows_i386_package
- .cmake_package_windows
- .cmake_release_artifacts
- - .windows_tags_nonconcurrent_vs2022
+ - .windows_x86_64_tags_nonconcurrent_vs2022
- .run_only_for_package
dependencies:
- b:windows-i386-package
@@ -1270,7 +1270,7 @@ b:windows-arm64-package:
- .windows_arm64_package
- .cmake_build_windows
- .cmake_build_package_artifacts
- - .windows_tags_nonconcurrent_vs2022_arm64
+ - .windows_x86_64_tags_nonconcurrent_vs2022_arm64
- .run_only_for_package
dependencies:
- p:doc-package
@@ -1284,7 +1284,7 @@ k:windows-arm64-package:
- .windows_arm64_package
- .cmake_package_windows
- .cmake_release_artifacts
- - .windows_tags_nonconcurrent_vs2022_arm64
+ - .windows_x86_64_tags_nonconcurrent_vs2022_arm64
- .run_only_for_package
dependencies:
- b:windows-arm64-package
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index f2946c1bd5..decf1b1be7 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -374,64 +374,47 @@
## Tags
-.linux_builder_tags:
+.linux_x86_64_tags:
tags:
- cmake
- build
- docker
- - linux
+ - linux-x86_64
-.linux_builder_tags_qt:
- tags:
- - cmake
- - build
- - docker
- - linux
- - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
-
-.linux_builder_tags_x11:
+.linux_x86_64_tags_x11:
tags:
- cmake
- docker
- - linux
- - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
+ - linux-x86_64
- x11
-.linux_builder_tags_cuda:
+.linux_x86_64_tags_cuda:
tags:
- cmake
- cuda-rt
- docker
- - linux
+ - linux-x86_64
-.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_x86_64_tags_radeon:
tags:
- cmake
- radeon
- docker
- - linux
-
-.linux_builder_tags_aarch64:
- tags:
- - cmake
- - build
- - docker
- - linux-aarch64
+ - linux-x86_64
-.linux_builder_tags_aarch64_qt:
+.linux_aarch64_tags:
tags:
- cmake
- build
- docker
- linux-aarch64
- - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
## Linux-specific scripts
@@ -591,7 +574,7 @@
extends:
- .intelclassic_makefiles
- .cmake_test_linux_release
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .run_manually
- .needs_centos6_x86_64
variables:
@@ -601,7 +584,7 @@
extends:
- .inteloneapi_makefiles
- .cmake_test_linux_release
- - .linux_builder_tags_qt
+ - .linux_x86_64_tags
- .run_manually
- .needs_centos6_x86_64
variables:
@@ -613,7 +596,7 @@
stage: build
extends:
- .fedora37
- - .linux_builder_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 4b71a1b965..258fa314d8 100644
--- a/.gitlab/os-macos.yml
+++ b/.gitlab/os-macos.yml
@@ -90,32 +90,32 @@
## Tags
-.macos_x86_64_builder_tags:
+.macos_x86_64_tags:
tags:
- cmake # Since this is a bare runner, pin to a project.
- - macos
+ - macos-x86_64
- shell
- 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
+ - macos-x86_64
- shell
- xcode-14.1
- nonconcurrent
- finder
-.macos_x86_64_builder_ext_tags:
+.macos_x86_64_tags_ext:
tags:
- cmake # Since this is a bare runner, pin to a project.
- - macos
+ - macos-x86_64
- shell
- 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_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..22d731a907 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -273,46 +273,46 @@
## Tags
-.windows_tags_nonconcurrent_vs2022:
+.windows_x86_64_tags_nonconcurrent_vs2022:
tags:
- cmake # Since this is a bare runner, pin to a project.
- - windows
+ - windows-x86_64
- shell
- vs2022
- 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
+ - windows-x86_64
- shell
- vs2022
- 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
+ - windows-x86_64
- shell
- vs2022
- 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
+ - windows-x86_64
- shell
- vs2019
- 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
+ - windows-x86_64
- shell
- concurrent