diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-23 14:52:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-11-23 14:52:48 (GMT) |
| commit | 6bab24e0d3c6684a3f3d651c08736da9e1535220 (patch) | |
| tree | fdf69b97de1eb6a44f78e4c58536c454113fb4b3 /.gitlab | |
| parent | deb9b076368512c1c7c391706f6f9e21cfb473f3 (diff) | |
| parent | 224d81e804c38d0f1041e20ab9bd9912ba0ec32f (diff) | |
| download | CMake-6bab24e0d3c6684a3f3d651c08736da9e1535220.zip CMake-6bab24e0d3c6684a3f3d651c08736da9e1535220.tar.gz CMake-6bab24e0d3c6684a3f3d651c08736da9e1535220.tar.bz2 | |
Merge topic 'ci-xcode-13.1' into release-3.22
224d81e804 gitlab-ci: update macOS jobs to use Xcode 13.1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6757
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/os-macos.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 3ffd9d7..66bbbf3 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -7,7 +7,7 @@ GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci ext/$CI_CONCURRENT_ID" # TODO: Factor this out so that each job selects the Xcode version to # use so that different versions can be tested in a single pipeline. - DEVELOPER_DIR: "/Applications/Xcode-13.0.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-13.1.app/Contents/Developer" # Avoid conflicting with other projects running on the same machine. SCCACHE_SERVER_PORT: 4227 @@ -87,7 +87,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.0 + - xcode-13.1 - nonconcurrent .macos_x86_64_builder_tags_package: @@ -95,7 +95,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.0 + - xcode-13.1 - nonconcurrent - finder @@ -104,7 +104,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.0 + - xcode-13.1 - concurrent .macos_arm64_builder_tags: @@ -112,7 +112,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-13.0 + - xcode-13.1 - nonconcurrent .macos_arm64_builder_ext_tags: @@ -120,7 +120,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-13.0 + - xcode-13.1 - concurrent ## macOS-specific scripts |