summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-09-17 17:00:32 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-09-17 17:00:37 (GMT)
commitac487f870b8c1117fa09782c43ed88f737c13fdc (patch)
tree37c4eaa754a41ea74e00e21c64798ae320f22857
parent314039ba45ad4f7779e2c4df46dab3fac3703194 (diff)
parent53709c764e0d560f2df140d8f9bed642aa74ffbd (diff)
downloadCMake-ac487f870b8c1117fa09782c43ed88f737c13fdc.zip
CMake-ac487f870b8c1117fa09782c43ed88f737c13fdc.tar.gz
CMake-ac487f870b8c1117fa09782c43ed88f737c13fdc.tar.bz2
Merge topic 'ci-xcode-11.7' into release-3.18
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.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml
index 9d123ec..74e27f6 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
@@ -53,7 +53,7 @@
- cmake # Since this is a bare runner, pin to a project.
- macos
- shell
- - xcode-11.5
+ - xcode-11.7
- nonconcurrent
.macos_builder_ext_tags:
@@ -61,7 +61,7 @@
- cmake # Since this is a bare runner, pin to a project.
- macos
- shell
- - xcode-11.5
+ - xcode-11.7
- concurrent
## macOS-specific scripts