Browse Source

Merge topic 'ci-macos-package'

7eeca582ed gitlab-ci: Move macOS packaging jobs to arm64 hosts

Acked-by: Kitware Robot <[email protected]>
Merge-request: !8464
Brad King 2 years ago
parent
commit
8383f44370
2 changed files with 11 additions and 11 deletions
  1. 2 2
      .gitlab-ci.yml
  2. 9 9
      .gitlab/os-macos.yml

+ 2 - 2
.gitlab-ci.yml

@@ -957,7 +957,7 @@ b:macos-package:
         - .macos_package
         - .cmake_build_macos
         - .cmake_release_artifacts
-        - .macos_x86_64_tags_package
+        - .macos_arm64_tags_package
         - .run_only_for_package
     dependencies:
         - p:doc-package
@@ -980,7 +980,7 @@ b:macos10.10-package:
         - .macos10.10_package
         - .cmake_build_macos
         - .cmake_release_artifacts
-        - .macos_x86_64_tags_package
+        - .macos_arm64_tags_package
         - .run_only_for_package
     dependencies:
         - p:doc-package

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

@@ -113,15 +113,6 @@
         - xcode-14.2
         - nonconcurrent
 
-.macos_x86_64_tags_package:
-    tags:
-        - cmake # Since this is a bare runner, pin to a project.
-        - macos-x86_64
-        - shell
-        - xcode-14.2
-        - nonconcurrent
-        - finder
-
 .macos_x86_64_tags_ext:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
@@ -146,6 +137,15 @@
         - xcode-14.2
         - concurrent
 
+.macos_arm64_tags_package:
+    tags:
+        - cmake # Since this is a bare runner, pin to a project.
+        - macos-arm64
+        - shell
+        - xcode-14.2
+        - nonconcurrent
+        - finder
+
 ## macOS-specific scripts
 
 .before_script_macos: &before_script_macos