From 5210b98ec276d4bb6e5dc2b7cca9abe84029cf69 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 9 May 2023 11:51:37 -0400 Subject: gitlab-ci: Move macOS Ninja Multi-Config nightly job to arm64 architecture --- .gitlab/ci/configure_macos_arm64_ninja_multi.cmake | 6 ++++++ .gitlab/ci/configure_macos_x86_64_ninja_multi.cmake | 6 ------ .gitlab/ci/env_macos_arm64_ninja_multi.sh | 3 +++ .gitlab/ci/env_macos_x86_64_ninja_multi.sh | 3 --- .gitlab/os-macos.yml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 .gitlab/ci/configure_macos_arm64_ninja_multi.cmake delete mode 100644 .gitlab/ci/configure_macos_x86_64_ninja_multi.cmake create mode 100644 .gitlab/ci/env_macos_arm64_ninja_multi.sh delete mode 100644 .gitlab/ci/env_macos_x86_64_ninja_multi.sh (limited to '.gitlab') diff --git a/.gitlab/ci/configure_macos_arm64_ninja_multi.cmake b/.gitlab/ci/configure_macos_arm64_ninja_multi.cmake new file mode 100644 index 0000000000..b22285c65b --- /dev/null +++ b/.gitlab/ci/configure_macos_arm64_ninja_multi.cmake @@ -0,0 +1,6 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_macos_x86_64_ninja_multi.cmake b/.gitlab/ci/configure_macos_x86_64_ninja_multi.cmake deleted file mode 100644 index b22285c65b..0000000000 --- a/.gitlab/ci/configure_macos_x86_64_ninja_multi.cmake +++ /dev/null @@ -1,6 +0,0 @@ -if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") - set(CMake_TEST_ISPC "ON" CACHE STRING "") -endif() - -include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/env_macos_arm64_ninja_multi.sh b/.gitlab/ci/env_macos_arm64_ninja_multi.sh new file mode 100644 index 0000000000..217ff305df --- /dev/null +++ b/.gitlab/ci/env_macos_arm64_ninja_multi.sh @@ -0,0 +1,3 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi diff --git a/.gitlab/ci/env_macos_x86_64_ninja_multi.sh b/.gitlab/ci/env_macos_x86_64_ninja_multi.sh deleted file mode 100644 index 217ff305df..0000000000 --- a/.gitlab/ci/env_macos_x86_64_ninja_multi.sh +++ /dev/null @@ -1,3 +0,0 @@ -if test "$CMAKE_CI_NIGHTLY" = "true"; then - source .gitlab/ci/ispc-env.sh -fi diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index f6fea3de32..3e11fd1aa0 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" -- cgit v1.2.1