浏览代码

Merge topic 'ci-xcode-13.4' into release-3.24

eddf057830 gitlab-ci: update macOS jobs to use Xcode 13.4

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7520
Brad King 3 年之前
父节点
当前提交
da7f3c09bf
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6 6
      .gitlab/os-macos.yml

+ 6 - 6
.gitlab/os-macos.yml

@@ -7,7 +7,7 @@
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci ext/$CI_CONCURRENT_ID"
         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
         # 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.
         # 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.
         # Avoid conflicting with other projects running on the same machine.
         SCCACHE_SERVER_PORT: 4227
         SCCACHE_SERVER_PORT: 4227
 
 
@@ -95,7 +95,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - cmake # Since this is a bare runner, pin to a project.
         - macos
         - macos
         - shell
         - shell
-        - xcode-13.3
+        - xcode-13.4
         - nonconcurrent
         - nonconcurrent
 
 
 .macos_x86_64_builder_tags_package:
 .macos_x86_64_builder_tags_package:
@@ -103,7 +103,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - cmake # Since this is a bare runner, pin to a project.
         - macos
         - macos
         - shell
         - shell
-        - xcode-13.3
+        - xcode-13.4
         - nonconcurrent
         - nonconcurrent
         - finder
         - finder
 
 
@@ -112,7 +112,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - cmake # Since this is a bare runner, pin to a project.
         - macos
         - macos
         - shell
         - shell
-        - xcode-13.3
+        - xcode-13.4
         - concurrent
         - concurrent
 
 
 .macos_arm64_builder_tags:
 .macos_arm64_builder_tags:
@@ -120,7 +120,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
         - macos-arm64
         - shell
         - shell
-        - xcode-13.3
+        - xcode-13.4
         - nonconcurrent
         - nonconcurrent
 
 
 .macos_arm64_builder_ext_tags:
 .macos_arm64_builder_ext_tags:
@@ -128,7 +128,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
         - macos-arm64
         - shell
         - shell
-        - xcode-13.3
+        - xcode-13.4
         - concurrent
         - concurrent
 
 
 ## macOS-specific scripts
 ## macOS-specific scripts