diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-26 15:12:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-04-26 15:12:51 (GMT) |
| commit | 7e4d6bbe0251c6d0fee3ff3781e8b590e10cb995 (patch) | |
| tree | 48e6957a48ac782c0cccf3bd35222100489d1a3e /.gitlab | |
| parent | ddefed68e52e08452e5e014524b9bff26804cafe (diff) | |
| parent | 65b6daf776713b7fd701c4aadaa89e102c048879 (diff) | |
| download | CMake-7e4d6bbe0251c6d0fee3ff3781e8b590e10cb995.zip CMake-7e4d6bbe0251c6d0fee3ff3781e8b590e10cb995.tar.gz CMake-7e4d6bbe0251c6d0fee3ff3781e8b590e10cb995.tar.bz2 | |
Merge topic 'ci-xcode-13.3' into release-3.23
65b6daf776 gitlab-ci: update macOS jobs to use Xcode 13.3
94361a1309 Tests: Ignore all classes in Xcode internal objc warnings
da9f864513 Tests: Teach RunCMake to ignore Xcode extension point warnings
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7204
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 b0844cb..3a5314c 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.2.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-13.3.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.2 + - xcode-13.3 - 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.2 + - xcode-13.3 - nonconcurrent - finder @@ -104,7 +104,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.2 + - xcode-13.3 - 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.2 + - xcode-13.3 - 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.2 + - xcode-13.3 - concurrent ## macOS-specific scripts |