diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-25 13:38:05 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-25 08:38:56 -0500 |
| commit | af966ec25ca979f6f7560fd0aa80bf6fde90c217 (patch) | |
| tree | dd0f28fb75109b7c1629b21ad743244b8a8303d3 /.gitlab | |
| parent | 885897e7a03bae30938240b944e5b7b002157b55 (diff) | |
| parent | 5213328008f12f97a2a9d124946f1a40a3f7dc14 (diff) | |
| download | cmake-af966ec25ca979f6f7560fd0aa80bf6fde90c217.tar.gz | |
Merge topic 'ci-xcode-12.2'
5213328008 gitlab-ci: update macOS jobs to use Xcode 12.2
928ca50b6f Tests: Teach RunCMake to ignore Xcode install_name_tool signature warnings
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5534
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/os-macos.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index db6f3bfb14..d9df6214e0 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.0.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-12.2.app/Contents/Developer" # Avoid conflicting with other projects running on the same machine. SCCACHE_SERVER_PORT: 4227 @@ -63,7 +63,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-12.0 + - xcode-12.2 - nonconcurrent .macos_builder_tags_package: @@ -71,7 +71,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-12.0 + - xcode-12.2 - nonconcurrent - finder @@ -80,7 +80,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-12.0 + - xcode-12.2 - concurrent ## macOS-specific scripts |