diff options
| author | Brad King <brad.king@kitware.com> | 2022-07-28 13:35:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-07-28 13:35:50 (GMT) |
| commit | faa4aed46f78bb4b2744d4ff042dd9d8a056bb3b (patch) | |
| tree | c7ef96b4e8f9610a08c18e711ddd62e0550f2a92 | |
| parent | d4762d46c7f2f458a6b8e13de6b464422d70cb7d (diff) | |
| parent | eddf0578305adb928a55f9b5fde09df3b98574a1 (diff) | |
| download | CMake-faa4aed46f78bb4b2744d4ff042dd9d8a056bb3b.zip CMake-faa4aed46f78bb4b2744d4ff042dd9d8a056bb3b.tar.gz CMake-faa4aed46f78bb4b2744d4ff042dd9d8a056bb3b.tar.bz2 | |
Merge branch 'ci-xcode-13.4' into release-3.22
Merge-request: !7520
| -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 3a5314c..0e06bd6 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-13.3.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-13.4.app/Contents/Developer" # Avoid conflicting with other projects running on the same machine. SCCACHE_SERVER_PORT: 4227 @@ -87,7 +87,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.3 + - xcode-13.4 - nonconcurrent .macos_x86_64_builder_tags_package: @@ -95,7 +95,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.3 + - xcode-13.4 - nonconcurrent - finder @@ -104,7 +104,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.3 + - xcode-13.4 - concurrent .macos_arm64_builder_tags: @@ -112,7 +112,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-13.3 + - xcode-13.4 - nonconcurrent .macos_arm64_builder_ext_tags: @@ -120,7 +120,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-13.3 + - xcode-13.4 - concurrent ## macOS-specific scripts |