summaryrefslogtreecommitdiffstats
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-06-15 19:42:08 (GMT)
committerBrad King <brad.king@kitware.com>2021-06-15 19:42:08 (GMT)
commit9c98878451f596e1fdf7e5887dd26349fd6ea8b1 (patch)
treecbee0f66464ec21c82e3dfbb8726bd804930eb0b /.gitlab
parentb61fe6a831c72050c3a4f830445f98696b0cedf7 (diff)
downloadCMake-9c98878451f596e1fdf7e5887dd26349fd6ea8b1.zip
CMake-9c98878451f596e1fdf7e5887dd26349fd6ea8b1.tar.gz
CMake-9c98878451f596e1fdf7e5887dd26349fd6ea8b1.tar.bz2
gitlab-ci: update macOS jobs to use Xcode 12.5
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/os-macos.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml
index 1ce96b3..9c4a920 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.4.app/Contents/Developer"
+ DEVELOPER_DIR: "/Applications/Xcode-12.5.app/Contents/Developer"
# Avoid conflicting with other projects running on the same machine.
SCCACHE_SERVER_PORT: 4227
@@ -87,7 +87,7 @@
- cmake # Since this is a bare runner, pin to a project.
- macos
- shell
- - xcode-12.4
+ - xcode-12.5
- nonconcurrent
.macos_x86_64_builder_tags_package:
@@ -95,7 +95,7 @@
- cmake # Since this is a bare runner, pin to a project.
- macos
- shell
- - xcode-12.4
+ - xcode-12.5
- nonconcurrent
- finder
@@ -104,7 +104,7 @@
- cmake # Since this is a bare runner, pin to a project.
- macos
- shell
- - xcode-12.4
+ - xcode-12.5
- concurrent
.macos_arm64_builder_tags:
@@ -112,7 +112,7 @@
- cmake # Since this is a bare runner, pin to a project.
- macos-arm64
- shell
- - xcode-12.4
+ - xcode-12.5
- nonconcurrent
.macos_arm64_builder_ext_tags:
@@ -120,7 +120,7 @@
- cmake # Since this is a bare runner, pin to a project.
- macos-arm64
- shell
- - xcode-12.4
+ - xcode-12.5
- concurrent
## macOS-specific scripts