diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-06 18:49:24 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-06 18:49:32 (GMT) |
| commit | 6fc45f0282c32f8ae2e55e95e39c74171921876a (patch) | |
| tree | fe1c297d93c7a786b808b628651812cefdae00ca | |
| parent | d0e3408d8bd1429d8cfd0cea5448c53255e44d3a (diff) | |
| parent | 7b4a50d6226fa8560a2b9f98a6d8413d750265c9 (diff) | |
| download | CMake-6fc45f0282c32f8ae2e55e95e39c74171921876a.zip CMake-6fc45f0282c32f8ae2e55e95e39c74171921876a.tar.gz CMake-6fc45f0282c32f8ae2e55e95e39c74171921876a.tar.bz2 | |
Merge topic 'ci-xcode-12.3' into release-3.19
7b4a50d622 gitlab-ci: update macOS jobs to use Xcode 12.3
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5670
| -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 8a006b1..7819e3f 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.2.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-12.3.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.2 + - xcode-12.3 - nonconcurrent .macos_builder_tags_package: @@ -71,7 +71,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-12.2 + - xcode-12.3 - nonconcurrent - finder @@ -80,7 +80,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-12.2 + - xcode-12.3 - concurrent ## macOS-specific scripts |