diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-29 14:24:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-29 14:25:02 (GMT) |
| commit | 1336d11d9ceabf070b75816b91c7ae9459f0817c (patch) | |
| tree | 1545e54d453dd54ad7782eb9e6b544b317fd949a | |
| parent | 9656a0f55a3084899af8297bdf4cd3b28622ae11 (diff) | |
| parent | 0508a80c1a835b880baa7b2bef6a162b88b3f3ef (diff) | |
| download | CMake-1336d11d9ceabf070b75816b91c7ae9459f0817c.zip CMake-1336d11d9ceabf070b75816b91c7ae9459f0817c.tar.gz CMake-1336d11d9ceabf070b75816b91c7ae9459f0817c.tar.bz2 | |
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
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d797955..8c0e9bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: |