diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-09 14:01:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-09 14:01:47 (GMT) |
| commit | 1b16275a54cf46da4568b96cf2a9703925017eb1 (patch) | |
| tree | 133c0735fa9e91ccc12cfa5d7b192783dee9918b /.gitlab | |
| parent | 070810b324aff78394c064be7674c57e5392064f (diff) | |
| parent | 68157fc57db8d4dd91ae4a5e57619215bf4b3bb7 (diff) | |
| download | CMake-1b16275a54cf46da4568b96cf2a9703925017eb1.zip CMake-1b16275a54cf46da4568b96cf2a9703925017eb1.tar.gz CMake-1b16275a54cf46da4568b96cf2a9703925017eb1.tar.bz2 | |
Merge topic 'ci-xcode-15.2' into release-3.29
68157fc57d gitlab-ci: update macOS jobs to use Xcode 15.2
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9237
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 2bd3e94..81e9ce2 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.1.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-15.2.app/Contents/Developer" # Avoid conflicting with other projects running on the same machine. SCCACHE_SERVER_PORT: 4227 @@ -135,7 +135,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 - shell - - xcode-15.1 + - xcode-15.2 - nonconcurrent .macos_x86_64_tags_ext: @@ -143,7 +143,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 - shell - - xcode-15.1 + - xcode-15.2 - concurrent .macos_arm64_tags: @@ -151,7 +151,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.1 + - xcode-15.2 - nonconcurrent .macos_arm64_tags_ext: @@ -159,7 +159,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.1 + - xcode-15.2 - concurrent .macos_arm64_tags_package: @@ -167,7 +167,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.1 + - xcode-15.2 - nonconcurrent - finder |