summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-02-19 17:02:18 (GMT)
committerBrad King <brad.king@kitware.com>2021-02-23 16:21:59 (GMT)
commit0755c2ffbbf256f99967f9b30cdd5b4c12ee3477 (patch)
tree4db9b44fdedd9425293fca6cfffa554a5548964a /.gitlab-ci.yml
parent73150a37982fe6822ddf3a3bc206ed35de013f1a (diff)
downloadCMake-0755c2ffbbf256f99967f9b30cdd5b4c12ee3477.zip
CMake-0755c2ffbbf256f99967f9b30cdd5b4c12ee3477.tar.gz
CMake-0755c2ffbbf256f99967f9b30cdd5b4c12ee3477.tar.bz2
gitlab-ci: rename macos build and test jobs to macos-x86_64
This makes room for future equivalents for other architectures. The packaging jobs produce universal binaries, so leave them as-is.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml46
1 files changed, 23 insertions, 23 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a322aa6..c88aa34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -236,62 +236,62 @@ build:linux-aarch64-package:
# macOS builds
-build:macos-ninja:
+build:macos-x86_64-ninja:
extends:
- - .macos_ninja
+ - .macos_x86_64_ninja
- .cmake_build_macos
- .cmake_build_artifacts
- - .macos_builder_tags
+ - .macos_x86_64_builder_tags
- .run_manually
-test:macos-ninja:
+test:macos-x86_64-ninja:
extends:
- - .macos_ninja
+ - .macos_x86_64_ninja
- .cmake_test_macos
- .cmake_test_artifacts
- - .macos_builder_tags
+ - .macos_x86_64_builder_tags
- .run_dependent
dependencies:
- - build:macos-ninja
+ - build:macos-x86_64-ninja
needs:
- - build:macos-ninja
+ - build:macos-x86_64-ninja
-build:macos-makefiles:
+build:macos-x86_64-makefiles:
extends:
- - .macos_makefiles
+ - .macos_x86_64_makefiles
- .cmake_build_macos
- .cmake_build_artifacts
- - .macos_builder_tags
+ - .macos_x86_64_builder_tags
- .run_manually
-test:macos-makefiles:
+test:macos-x86_64-makefiles:
extends:
- - .macos_makefiles
+ - .macos_x86_64_makefiles
- .cmake_test_macos
- - .macos_builder_tags
+ - .macos_x86_64_builder_tags
- .run_dependent
dependencies:
- - build:macos-makefiles
+ - build:macos-x86_64-makefiles
needs:
- - build:macos-makefiles
+ - build:macos-x86_64-makefiles
-test:macos-xcode:
+test:macos-x86_64-xcode:
extends:
- - .macos_xcode
+ - .macos_x86_64_xcode
- .cmake_test_macos_external
- - .macos_builder_ext_tags
+ - .macos_x86_64_builder_ext_tags
- .run_dependent
dependencies:
- - test:macos-ninja
+ - test:macos-x86_64-ninja
needs:
- - test:macos-ninja
+ - test:macos-x86_64-ninja
build:macos-package:
extends:
- .macos_package
- .cmake_build_macos_package
- .cmake_release_artifacts
- - .macos_builder_tags_package
+ - .macos_x86_64_builder_tags_package
- .run_only_for_package
dependencies:
- prep:doc-package
@@ -314,7 +314,7 @@ build:macos10.10-package:
- .macos10.10_package
- .cmake_build_macos_package
- .cmake_release_artifacts
- - .macos_builder_tags_package
+ - .macos_x86_64_builder_tags_package
- .run_only_for_package
dependencies:
- prep:doc-package