diff options
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_arm64_ninja_multi.cmake (renamed from .gitlab/ci/configure_macos_x86_64_ninja_multi.cmake) | 0 | ||||
| -rw-r--r-- | .gitlab/ci/env_macos_arm64_ninja_multi.sh (renamed from .gitlab/ci/env_macos_x86_64_ninja_multi.sh) | 0 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 700e436..82abb44 100644 --- 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" diff --git a/.gitlab/ci/configure_macos_x86_64_ninja_multi.cmake b/.gitlab/ci/configure_macos_arm64_ninja_multi.cmake index b22285c..b22285c 100644 --- a/.gitlab/ci/configure_macos_x86_64_ninja_multi.cmake +++ b/.gitlab/ci/configure_macos_arm64_ninja_multi.cmake diff --git a/.gitlab/ci/env_macos_x86_64_ninja_multi.sh b/.gitlab/ci/env_macos_arm64_ninja_multi.sh index 217ff30..217ff30 100644 --- a/.gitlab/ci/env_macos_x86_64_ninja_multi.sh +++ b/.gitlab/ci/env_macos_arm64_ninja_multi.sh diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index f6fea3d..3e11fd1 100644 --- 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" |