diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-04 15:24:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-04 15:24:20 (GMT) |
| commit | d332a2c71ed1641a983e07bb78895cbd98752887 (patch) | |
| tree | 24e5120517f13ffdb16219656689fb71e98a38d3 /.gitlab | |
| parent | 182ef53d3d6779db09be196f5be245ffb5d57640 (diff) | |
| parent | 0d3d6870678f9390bdcee6acf19f92f771eefcda (diff) | |
| download | CMake-d332a2c71ed1641a983e07bb78895cbd98752887.zip CMake-d332a2c71ed1641a983e07bb78895cbd98752887.tar.gz CMake-d332a2c71ed1641a983e07bb78895cbd98752887.tar.bz2 | |
Merge topic 'ci-xcode-14.1'
0d3d687067 gitlab-ci: update macOS jobs to use Xcode 14.1
9684a589ca Source: Replace uses of sprintf with safer snprintf in CMake 3.24 branch
eea23d21a3 Source: Tell Git not to check whitespace in third-party curses form code
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7863
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/os-macos.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 1803846..82bcf01 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-14.0.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-14.1.app/Contents/Developer" # Avoid conflicting with other projects running on the same machine. SCCACHE_SERVER_PORT: 4227 @@ -95,7 +95,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-14.0 + - xcode-14.1 - nonconcurrent .macos_x86_64_builder_tags_package: @@ -103,7 +103,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-14.0 + - xcode-14.1 - nonconcurrent - finder @@ -112,7 +112,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-14.0 + - xcode-14.1 - concurrent .macos_arm64_builder_tags: @@ -120,7 +120,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-14.0 + - xcode-14.1 - nonconcurrent .macos_arm64_builder_ext_tags: @@ -128,7 +128,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-14.0 + - xcode-14.1 - concurrent ## macOS-specific scripts |