diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-06 14:25:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-06 14:25:30 (GMT) |
| commit | 1e3cc4b2b18678985cb285e0031d51127af59eaf (patch) | |
| tree | 5786a909771e76a6572ecc5ed07c1c327d718828 /.gitlab | |
| parent | 5eef6ca26da9ed2ddd424d4d69bd4fd20933a9fd (diff) | |
| parent | 429522e89c5322d19d6215cfb7e6a76a74d84874 (diff) | |
| download | CMake-1e3cc4b2b18678985cb285e0031d51127af59eaf.zip CMake-1e3cc4b2b18678985cb285e0031d51127af59eaf.tar.gz CMake-1e3cc4b2b18678985cb285e0031d51127af59eaf.tar.bz2 | |
Merge topic 'ci-xcode-13.0' into release-3.21
429522e89c gitlab-ci: update macOS jobs to use Xcode 13.0
75901f0472 Tests: Fix RunCMake.XcodeProject XcodeIOSInstallCombined cases for Xcode 13.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6578
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 9c4a920..b79d46d 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.5.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-13.0.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.5 + - xcode-13.0 - 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.5 + - xcode-13.0 - nonconcurrent - finder @@ -104,7 +104,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-12.5 + - xcode-13.0 - 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.5 + - xcode-13.0 - 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.5 + - xcode-13.0 - concurrent ## macOS-specific scripts |