Merge topic 'gitlab-ci-xcode-11.5'

0508a80c1a gitlab-ci: update macOS jobs to Xcode 11.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4821
This commit is contained in:
Brad King
2020-05-29 14:24:55 +00:00
committed by Kitware Robot

View File

@@ -75,7 +75,7 @@
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
# 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.3.app/Contents/Developer"
DEVELOPER_DIR: "/Applications/Xcode-11.5.app/Contents/Developer"
.macos_ninja: &macos_ninja
extends: .macos
@@ -147,7 +147,7 @@
- cmake # Since this is a bare runner, pin to a project.
- macos
- shell
- xcode-11.3
- xcode-11.5
.windows_builder_tags: &windows_builder_tags
tags: