Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 19:08:07 +08:00
Code Issues Projects Releases Wiki Activity

Merge topic 'ci-xcode-12.3'

Browse Source 
7b4a50d622 gitlab-ci: update macOS jobs to use Xcode 12.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5670
This commit is contained in:
Brad King
2021-01-06 18:49:24 +00:00
committed by Kitware Robot
parent 91f0f4aa73 7b4a50d622
commit a24de5c59a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab/os-macos.yml
View File

@@ -7,7 +7,7 @@
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci ext/$CI_CONCURRENT_ID" 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 # 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. # use so that different versions can be tested in a single pipeline.
DEVELOPER_DIR: "/Applications/Xcode-12.2.app/Contents/Developer" DEVELOPER_DIR: "/Applications/Xcode-12.3.app/Contents/Developer"
# Avoid conflicting with other projects running on the same machine. # Avoid conflicting with other projects running on the same machine.
SCCACHE_SERVER_PORT: 4227 SCCACHE_SERVER_PORT: 4227
@@ -63,7 +63,7 @@
- cmake # Since this is a bare runner, pin to a project. - cmake # Since this is a bare runner, pin to a project.
- macos - macos
- shell - shell
- xcode-12.2 - xcode-12.3
- nonconcurrent - nonconcurrent
.macos_builder_tags_package: .macos_builder_tags_package:
@@ -71,7 +71,7 @@
- cmake # Since this is a bare runner, pin to a project. - cmake # Since this is a bare runner, pin to a project.
- macos - macos
- shell - shell
- xcode-12.2 - xcode-12.3
- nonconcurrent - nonconcurrent
- finder - finder
@@ -80,7 +80,7 @@
- cmake # Since this is a bare runner, pin to a project. - cmake # Since this is a bare runner, pin to a project.
- macos - macos
- shell - shell
- xcode-12.2 - xcode-12.3
- concurrent - concurrent
## macOS-specific scripts ## macOS-specific scripts