diff options
| author | Brad King <brad.king@kitware.com> | 2022-07-28 14:38:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-07-28 14:39:07 (GMT) |
| commit | da7f3c09bfd6c91b9e830120beb15e29448fed82 (patch) | |
| tree | 64074a389fd2beccc21d34042f6ab275f68d0045 /.gitlab | |
| parent | 12830cc2a9a62470bcca9e06ced3ee8b370a2bd5 (diff) | |
| parent | eddf0578305adb928a55f9b5fde09df3b98574a1 (diff) | |
| download | CMake-da7f3c09bfd6c91b9e830120beb15e29448fed82.zip CMake-da7f3c09bfd6c91b9e830120beb15e29448fed82.tar.gz CMake-da7f3c09bfd6c91b9e830120beb15e29448fed82.tar.bz2 | |
Merge topic 'ci-xcode-13.4' into release-3.24
eddf057830 gitlab-ci: update macOS jobs to use Xcode 13.4
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7520
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 3183bf7..5632f6d 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.3.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-13.4.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.3 + - xcode-13.4 - 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.3 + - xcode-13.4 - nonconcurrent - finder @@ -112,7 +112,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.3 + - xcode-13.4 - 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.3 + - xcode-13.4 - 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.3 + - xcode-13.4 - concurrent ## macOS-specific scripts |