diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-19 17:02:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-02-23 16:21:59 (GMT) |
| commit | 0755c2ffbbf256f99967f9b30cdd5b4c12ee3477 (patch) | |
| tree | 4db9b44fdedd9425293fca6cfffa554a5548964a /.gitlab | |
| parent | 73150a37982fe6822ddf3a3bc206ed35de013f1a (diff) | |
| download | CMake-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')
| -rw-r--r-- | .gitlab/ci/configure_macos_x86_64_makefiles.cmake (renamed from .gitlab/ci/configure_macos_ninja.cmake) | 0 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_x86_64_ninja.cmake (renamed from .gitlab/ci/configure_macos_makefiles.cmake) | 0 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_x86_64_xcode.cmake (renamed from .gitlab/ci/configure_macos_xcode.cmake) | 0 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 18 |
4 files changed, 9 insertions, 9 deletions
diff --git a/.gitlab/ci/configure_macos_ninja.cmake b/.gitlab/ci/configure_macos_x86_64_makefiles.cmake index f657d98..f657d98 100644 --- a/.gitlab/ci/configure_macos_ninja.cmake +++ b/.gitlab/ci/configure_macos_x86_64_makefiles.cmake diff --git a/.gitlab/ci/configure_macos_makefiles.cmake b/.gitlab/ci/configure_macos_x86_64_ninja.cmake index f657d98..f657d98 100644 --- a/.gitlab/ci/configure_macos_makefiles.cmake +++ b/.gitlab/ci/configure_macos_x86_64_ninja.cmake diff --git a/.gitlab/ci/configure_macos_xcode.cmake b/.gitlab/ci/configure_macos_x86_64_xcode.cmake index 1b976d2..1b976d2 100644 --- a/.gitlab/ci/configure_macos_xcode.cmake +++ b/.gitlab/ci/configure_macos_x86_64_xcode.cmake diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 450bae7..a7f55a7 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -24,18 +24,18 @@ # could run at the same time, so we drop it. GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" -.macos_ninja: +.macos_x86_64_ninja: extends: .macos_build variables: - CMAKE_CONFIGURATION: macos_ninja + CMAKE_CONFIGURATION: macos_x86_64_ninja CTEST_NO_WARNINGS_ALLOWED: 1 -.macos_makefiles: +.macos_x86_64_makefiles: extends: .macos_build variables: - CMAKE_CONFIGURATION: macos_makefiles + CMAKE_CONFIGURATION: macos_x86_64_makefiles CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" @@ -57,16 +57,16 @@ ### External testing -.macos_xcode: +.macos_x86_64_xcode: extends: .macos variables: - CMAKE_CONFIGURATION: macos_xcode + CMAKE_CONFIGURATION: macos_x86_64_xcode CMAKE_GENERATOR: Xcode ## Tags -.macos_builder_tags: +.macos_x86_64_builder_tags: tags: - cmake # Since this is a bare runner, pin to a project. - macos @@ -74,7 +74,7 @@ - xcode-12.3 - nonconcurrent -.macos_builder_tags_package: +.macos_x86_64_builder_tags_package: tags: - cmake # Since this is a bare runner, pin to a project. - macos @@ -83,7 +83,7 @@ - nonconcurrent - finder -.macos_builder_ext_tags: +.macos_x86_64_builder_ext_tags: tags: - cmake # Since this is a bare runner, pin to a project. - macos |