diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-25 15:52:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-25 15:52:35 (GMT) |
| commit | 304ed74dc30e4c11034fb479078cd60bd580a128 (patch) | |
| tree | 159f0e28923b80b107199af4fb7f16c60f513ece /.gitlab | |
| parent | a5678e46f8fd6a1f4081165b770a6249b3225e88 (diff) | |
| parent | 85ef0a84a0ff9d87cd88937ebc79e4844d995db5 (diff) | |
| download | CMake-304ed74dc30e4c11034fb479078cd60bd580a128.zip CMake-304ed74dc30e4c11034fb479078cd60bd580a128.tar.gz CMake-304ed74dc30e4c11034fb479078cd60bd580a128.tar.bz2 | |
Merge topic 'ci-xcode-12.4'
85ef0a84a0 gitlab-ci: update macOS jobs to use Xcode 12.4
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5858
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 7fe6277..810fdca 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.3.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-12.4.app/Contents/Developer" # Avoid conflicting with other projects running on the same machine. SCCACHE_SERVER_PORT: 4227 @@ -85,7 +85,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-12.3 + - xcode-12.4 - nonconcurrent .macos_x86_64_builder_tags_package: @@ -93,7 +93,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-12.3 + - xcode-12.4 - nonconcurrent - finder @@ -102,7 +102,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-12.3 + - xcode-12.4 - concurrent .macos_arm64_builder_tags: @@ -110,7 +110,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-12.3 + - xcode-12.4 - nonconcurrent .macos_arm64_builder_ext_tags: @@ -118,7 +118,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-12.3 + - xcode-12.4 - concurrent ## macOS-specific scripts |