diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-16 12:14:01 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-16 08:14:41 -0400 |
| commit | a9ff600a509d6af1c25f482e1ce0184c97dd3f54 (patch) | |
| tree | cbee0f66464ec21c82e3dfbb8726bd804930eb0b | |
| parent | b61fe6a831c72050c3a4f830445f98696b0cedf7 (diff) | |
| parent | 9c98878451f596e1fdf7e5887dd26349fd6ea8b1 (diff) | |
| download | cmake-a9ff600a509d6af1c25f482e1ce0184c97dd3f54.tar.gz | |
Merge topic 'ci-xcode-12.5' into release-3.20
9c98878451 gitlab-ci: update macOS jobs to use Xcode 12.5
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6229
| -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 1ce96b30cf..9c4a920797 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-12.4.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-12.5.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-12.4 + - xcode-12.5 - 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-12.4 + - xcode-12.5 - nonconcurrent - finder @@ -104,7 +104,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-12.4 + - xcode-12.5 - concurrent .macos_arm64_builder_tags: @@ -112,7 +112,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-12.4 + - xcode-12.5 - 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-12.4 + - xcode-12.5 - concurrent ## macOS-specific scripts |