diff options
| author | Brad King <brad.king@kitware.com> | 2024-08-21 12:50:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-08-21 12:50:23 (GMT) |
| commit | 0e217de3437699cb1133a04fb1670489378e22dd (patch) | |
| tree | 8f92b1f2567fca43e7f26a59be89f881fa370cbd | |
| parent | 3b8e86d1219e852828c6ba7ddb4b471fd301b583 (diff) | |
| parent | a05de5902981a450b7553bade3545f7b1c8524b9 (diff) | |
| download | CMake-0e217de3437699cb1133a04fb1670489378e22dd.zip CMake-0e217de3437699cb1133a04fb1670489378e22dd.tar.gz CMake-0e217de3437699cb1133a04fb1670489378e22dd.tar.bz2 | |
Merge topic 'ci-xcode-15.4' into release-3.30
a05de59029 gitlab-ci: update macOS jobs to use Xcode 15.4
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9761
| -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 2b265ea..527923e 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-15.3.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-15.4.app/Contents/Developer" # Avoid conflicting with other projects running on the same machine. SCCACHE_SERVER_PORT: 4227 @@ -142,7 +142,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 - shell - - xcode-15.3 + - xcode-15.4 - nonconcurrent .macos_x86_64_tags_ext: @@ -150,7 +150,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 - shell - - xcode-15.3 + - xcode-15.4 - concurrent .macos_arm64_tags: @@ -158,7 +158,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.3 + - xcode-15.4 - nonconcurrent .macos_arm64_tags_ext: @@ -166,7 +166,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.3 + - xcode-15.4 - concurrent .macos_arm64_tags_package: @@ -174,7 +174,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.3 + - xcode-15.4 - nonconcurrent - finder |