diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-10 13:39:59 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-05-10 09:40:10 -0400 |
| commit | 8383f44370d9aa72611a9537cd6be9209f2c71ed (patch) | |
| tree | 88342ed4ad10b37fd222550acf1bca89fe514162 | |
| parent | 043ce95abf7f874e54aa039c8a8a4a4bacf43045 (diff) | |
| parent | 7eeca582ed58e51563627cae389ed4efae6ad88e (diff) | |
| download | cmake-8383f44370d9aa72611a9537cd6be9209f2c71ed.tar.gz | |
Merge topic 'ci-macos-package'
7eeca582ed gitlab-ci: Move macOS packaging jobs to arm64 hosts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8464
| -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 |