diff options
author | Brad King <brad.king@kitware.com> | 2023-05-04 14:29:09 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2023-05-09 14:32:24 -0400 |
commit | 7eeca582ed58e51563627cae389ed4efae6ad88e (patch) | |
tree | 3384c12e1cbb1aaa6cd89056ca2f5bb99152db7b | |
parent | a2fba5967a1fd32dd75681c375fc7ea122f2cb38 (diff) | |
download | cmake-7eeca582ed58e51563627cae389ed4efae6ad88e.tar.gz |
gitlab-ci: Move macOS packaging jobs to arm64 hosts
Over time we are adding `arm64` hosts and removing `x86_64` hosts.
-rw-r--r-- | .gitlab-ci.yml | 4 | ||||
-rw-r--r-- | .gitlab/os-macos.yml | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a4140661b..0c405a735b 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 6f0bea58e2..f6fea3de32 100644 --- a/.gitlab/os-macos.yml +++ b/.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 |