diff options
author | Brad King <brad.king@kitware.com> | 2022-12-16 13:49:34 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-12-16 13:49:49 (GMT) |
commit | b04e53035a2fc77a79a488ad0044b60ecb8b2ace (patch) | |
tree | 254224a4282790ccb868da4217388fb618d1a054 /.gitlab | |
parent | 9a3c232dc0ad8c89b36be65827e5f063a400f138 (diff) | |
parent | 85d2ce0bfe0e9f757b191a032512f6c180bde3de (diff) | |
download | CMake-b04e53035a2fc77a79a488ad0044b60ecb8b2ace.zip CMake-b04e53035a2fc77a79a488ad0044b60ecb8b2ace.tar.gz CMake-b04e53035a2fc77a79a488ad0044b60ecb8b2ace.tar.bz2 |
Merge topic 'ci-xcode-14.2'
85d2ce0bfe gitlab-ci: update macOS jobs to use Xcode 14.2
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8023
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 258fa31..9cdc8d4 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-14.1.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-14.2.app/Contents/Developer" # Avoid conflicting with other projects running on the same machine. SCCACHE_SERVER_PORT: 4227 @@ -95,7 +95,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 - shell - - xcode-14.1 + - xcode-14.2 - nonconcurrent .macos_x86_64_tags_package: @@ -103,7 +103,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 - shell - - xcode-14.1 + - xcode-14.2 - nonconcurrent - finder @@ -112,7 +112,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 - shell - - xcode-14.1 + - xcode-14.2 - concurrent .macos_arm64_tags: @@ -120,7 +120,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-14.1 + - xcode-14.2 - nonconcurrent .macos_arm64_tags_ext: @@ -128,7 +128,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-14.1 + - xcode-14.2 - concurrent ## macOS-specific scripts |