gitlab-ci: Move macOS Ninja Multi-Config nightly job to arm64 architecture

2023-05-09 11:51:37 -04:00 · 2023-05-09 11:51:37 -04:00 · 5210b98ec2
commit 5210b98ec2
parent 3a9b8ef047
4 changed files with 7 additions and 7 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -884,17 +884,17 @@ t:macos-x86_64-makefiles:
    needs:
        - b:macos-x86_64-makefiles

-t:macos-x86_64-ninja-multi:
+t:macos-arm64-ninja-multi:
    extends:
-        - .macos_x86_64_ninja_multi
+        - .macos_arm64_ninja_multi
        - .cmake_test_macos_external
-        - .macos_x86_64_tags_ext
+        - .macos_arm64_tags_ext
        - .cmake_junit_artifacts
        - .run_dependent
    dependencies:
-        - t:macos-x86_64-ninja
+        - t:macos-arm64-ninja
    needs:
-        - t:macos-x86_64-ninja
+        - t:macos-arm64-ninja
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

--- a/.gitlab/ci/configure_macos_x86_64_ninja_multi.cmake
+++ b/.gitlab/ci/configure_macos_x86_64_ninja_multi.cmake
--- a/.gitlab/ci/env_macos_x86_64_ninja_multi.sh
+++ b/.gitlab/ci/env_macos_x86_64_ninja_multi.sh
--- a/.gitlab/os-macos.yml
+++ b/.gitlab/os-macos.yml
@ -88,11 +88,11 @@
        CMAKE_GENERATOR: Xcode
        CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"

-.macos_x86_64_ninja_multi:
+.macos_arm64_ninja_multi:
    extends: .macos

    variables:
-        CMAKE_CONFIGURATION: macos_x86_64_ninja_multi
+        CMAKE_CONFIGURATION: macos_arm64_ninja_multi
        CMAKE_GENERATOR: "Ninja Multi-Config"
        CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"