diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-04 15:24:11 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-04 11:24:19 -0400 |
| commit | 8ad7e5530845d2fea531f16a122d0604d6275d4f (patch) | |
| tree | b71157cc2639c731a0a08d0bd821ac911c5c08d3 /.gitlab | |
| parent | 48ed0f8a1ce8b524c114f35e603a87f2c004d285 (diff) | |
| parent | 0d3d6870678f9390bdcee6acf19f92f771eefcda (diff) | |
| download | cmake-8ad7e5530845d2fea531f16a122d0604d6275d4f.tar.gz | |
Merge topic 'ci-xcode-14.1' into release-3.25
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 180384660f..82bcf01e89 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 |