diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-13 14:50:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-03-13 14:51:13 (GMT) |
| commit | 1edb2b409aecc1a171584b661d29e6c95c1f2655 (patch) | |
| tree | ebd3aa758302cc5e707fff3bb6a2a3330d0f58a5 /.gitlab | |
| parent | 30c8930e8b2381d01d5595c21f3605706a360a8b (diff) | |
| parent | 682767e8a5028fe930913d3144d9182797fd4331 (diff) | |
| download | CMake-1edb2b409aecc1a171584b661d29e6c95c1f2655.zip CMake-1edb2b409aecc1a171584b661d29e6c95c1f2655.tar.gz CMake-1edb2b409aecc1a171584b661d29e6c95c1f2655.tar.bz2 | |
Merge topic 'ci-xcode-15.3'
682767e8a5 Merge branch 'backport-3.28-ci-xcode-15.3'
e572986231 LinkerId: Update detection of linker tool for Xcode 15.3
8a6d05aa9d gitlab-ci: update macOS jobs to use Xcode 15.3
7bf893bc30 Tests: Update RunCMake.CheckCompilerFlag for Xcode 15.3
7f5f0ab4b3 Tests: Update RunCMake.CompileFeatures for Xcode 15.3
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9333
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 81e9ce2..23c68d5 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.2.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-15.3.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.2 + - xcode-15.3 - 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.2 + - xcode-15.3 - concurrent .macos_arm64_tags: @@ -151,7 +151,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.2 + - xcode-15.3 - 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.2 + - xcode-15.3 - 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.2 + - xcode-15.3 - nonconcurrent - finder |