diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-03 14:31:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-03 14:31:27 (GMT) |
| commit | 42c0428e5fa8ecd37396dd48d1c800a7249c3795 (patch) | |
| tree | bd2deb13960f2f8d3663e2eb08f117d98ff3e322 /.gitlab | |
| parent | 6533383134c22204d1ec6d274d97f60f0a85f496 (diff) | |
| parent | 9cdf4c9be4433bba018d41df046466de756e96a6 (diff) | |
| download | CMake-42c0428e5fa8ecd37396dd48d1c800a7249c3795.zip CMake-42c0428e5fa8ecd37396dd48d1c800a7249c3795.tar.gz CMake-42c0428e5fa8ecd37396dd48d1c800a7249c3795.tar.bz2 | |
Merge topic 'ci-xcode-14.0'
9cdf4c9be4 gitlab-ci: update macOS jobs to use Xcode 14.0
5d2c2b2558 Tests: Update RunCMake.XcodeProject iOS cases for Xcode 14.0
12c6fec6b4 Xcode: Drop CMAKE_INTDIR= definition in Swift targets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7732
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 5632f6d..1803846 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.4.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-14.0.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 - shell - - xcode-13.4 + - xcode-14.0 - nonconcurrent .macos_x86_64_builder_tags_package: @@ -103,7 +103,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.4 + - xcode-14.0 - nonconcurrent - finder @@ -112,7 +112,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.4 + - xcode-14.0 - concurrent .macos_arm64_builder_tags: @@ -120,7 +120,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-13.4 + - xcode-14.0 - nonconcurrent .macos_arm64_builder_ext_tags: @@ -128,7 +128,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-13.4 + - xcode-14.0 - concurrent ## macOS-specific scripts |