diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-17 17:00:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-17 17:00:37 (GMT) |
| commit | d12fd8e84ffa1a51be8d7735d7de670de63fa83d (patch) | |
| tree | c18fd4908a0f9d67d30c3cb1a592f0ab3c41a8b3 | |
| parent | 46bb6ae8d44e403f2fdd3ae6b074c74426ac20bb (diff) | |
| parent | bfae54b40c082e61893c5d6f57a614bc06728058 (diff) | |
| download | CMake-d12fd8e84ffa1a51be8d7735d7de670de63fa83d.zip CMake-d12fd8e84ffa1a51be8d7735d7de670de63fa83d.tar.gz CMake-d12fd8e84ffa1a51be8d7735d7de670de63fa83d.tar.bz2 | |
Merge topic 'ci-xcode-11.7'
bfae54b40c Merge branch 'backport-3.18-ci-xcode-11.7' into ci-xcode-11.7
135a2d26d3 gitlab-ci: update macOS jobs to use Xcode 11.7
53709c764e gitlab-ci: update macOS jobs to use Xcode 11.7
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5236
| -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 de1093d..96ec264 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-11.5.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-11.7.app/Contents/Developer" ### Build and test @@ -61,7 +61,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-11.5 + - xcode-11.7 - nonconcurrent .macos_builder_tags_package: @@ -69,7 +69,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-11.5 + - xcode-11.7 - nonconcurrent - finder @@ -78,7 +78,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-11.5 + - xcode-11.7 - concurrent ## macOS-specific scripts |