diff options
| author | Brad King <brad.king@kitware.com> | 2023-12-12 14:58:05 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-12-12 14:58:20 (GMT) |
| commit | 5b4a54f4cff601e38242770ffabedbe4bf6e8314 (patch) | |
| tree | 009b7dded098012e6501d9a0545660fd376af78b /.gitlab | |
| parent | 0ef98a6dd3da3072fd4d33f0a58003afd2730a20 (diff) | |
| parent | e2d25c67247ca3e0c1b09f16119d4c99fa7c052d (diff) | |
| download | CMake-5b4a54f4cff601e38242770ffabedbe4bf6e8314.zip CMake-5b4a54f4cff601e38242770ffabedbe4bf6e8314.tar.gz CMake-5b4a54f4cff601e38242770ffabedbe4bf6e8314.tar.bz2 | |
Merge topic 'ci-xcode-15.1'
e2d25c6724 gitlab-ci: update macOS jobs to use Xcode 15.1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9066
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 b3165fa..2bd3e94 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.0.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-15.1.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.0 + - xcode-15.1 - 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.0 + - xcode-15.1 - concurrent .macos_arm64_tags: @@ -151,7 +151,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.0 + - xcode-15.1 - 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.0 + - xcode-15.1 - 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.0 + - xcode-15.1 - nonconcurrent - finder |