diff options
author | Brad King <brad.king@kitware.com> | 2022-01-25 11:55:34 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-01-25 11:55:46 (GMT) |
commit | 5140e7bc30d3fde5efe9d3fed0d76169e1375ebf (patch) | |
tree | 85001f3b55a9ecaa3065fc9e26a0448b525d0a28 /.gitlab/os-macos.yml | |
parent | 28e90f9576fa5784408c03cf20bf172b20e418f0 (diff) | |
parent | 8cb32fc8ad849a1b80d0da39084df263a42fb8b5 (diff) | |
download | CMake-5140e7bc30d3fde5efe9d3fed0d76169e1375ebf.zip CMake-5140e7bc30d3fde5efe9d3fed0d76169e1375ebf.tar.gz CMake-5140e7bc30d3fde5efe9d3fed0d76169e1375ebf.tar.bz2 |
Merge topic 'ci-xcode-13.2'
8cb32fc8ad gitlab-ci: update macOS jobs to use Xcode 13.2
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6897
Diffstat (limited to '.gitlab/os-macos.yml')
-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 66bbbf3..b0844cb 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.1.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-13.2.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.1 + - xcode-13.2 - 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.1 + - xcode-13.2 - nonconcurrent - finder @@ -104,7 +104,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.1 + - xcode-13.2 - 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.1 + - xcode-13.2 - 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.1 + - xcode-13.2 - concurrent ## macOS-specific scripts |