From 3a20a5f149a50c219f341a9623815443220a8b52 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 9 May 2023 11:19:50 -0400
Subject: gitlab-ci: Move macOS+Xcode universal binaries job to arm64

Over time we are adding `arm64` hosts and removing `x86_64` hosts.
---
 .gitlab-ci.yml                                   | 10 +++++-----
 .gitlab/ci/configure_macos_arm64_xcode_ub.cmake  |  2 ++
 .gitlab/ci/configure_macos_x86_64_xcode_ub.cmake |  2 --
 .gitlab/ci/env_macos_arm64_xcode_ub.cmake        |  1 +
 .gitlab/ci/env_macos_x86_64_xcode_ub.cmake       |  1 -
 .gitlab/os-macos.yml                             |  4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 .gitlab/ci/configure_macos_arm64_xcode_ub.cmake
 delete mode 100644 .gitlab/ci/configure_macos_x86_64_xcode_ub.cmake
 create mode 100644 .gitlab/ci/env_macos_arm64_xcode_ub.cmake
 delete mode 100644 .gitlab/ci/env_macos_x86_64_xcode_ub.cmake

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82abb44..305c8d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -938,17 +938,17 @@ t:macos-x86_64-ninja-ub:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:macos-x86_64-xcode-ub:
+t:macos-arm64-xcode-ub:
     extends:
-        - .macos_x86_64_xcode_ub
+        - .macos_arm64_xcode_ub
         - .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_arm64_xcode_ub.cmake b/.gitlab/ci/configure_macos_arm64_xcode_ub.cmake
new file mode 100644
index 0000000..1b976d2
--- /dev/null
+++ b/.gitlab/ci/configure_macos_arm64_xcode_ub.cmake
@@ -0,0 +1,2 @@
+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_xcode_ub.cmake b/.gitlab/ci/configure_macos_x86_64_xcode_ub.cmake
deleted file mode 100644
index 1b976d2..0000000
--- a/.gitlab/ci/configure_macos_x86_64_xcode_ub.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-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_xcode_ub.cmake b/.gitlab/ci/env_macos_arm64_xcode_ub.cmake
new file mode 100644
index 0000000..244f088
--- /dev/null
+++ b/.gitlab/ci/env_macos_arm64_xcode_ub.cmake
@@ -0,0 +1 @@
+set(ENV{CMAKE_OSX_ARCHITECTURES} "arm64;x86_64")
diff --git a/.gitlab/ci/env_macos_x86_64_xcode_ub.cmake b/.gitlab/ci/env_macos_x86_64_xcode_ub.cmake
deleted file mode 100644
index 4b5c401..0000000
--- a/.gitlab/ci/env_macos_x86_64_xcode_ub.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(ENV{CMAKE_OSX_ARCHITECTURES} "x86_64;arm64")
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml
index 3e11fd1..1579338 100644
--- a/.gitlab/os-macos.yml
+++ b/.gitlab/os-macos.yml
@@ -80,11 +80,11 @@
         CMAKE_GENERATOR: Xcode
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
-.macos_x86_64_xcode_ub:
+.macos_arm64_xcode_ub:
     extends: .macos
 
     variables:
-        CMAKE_CONFIGURATION: macos_x86_64_xcode_ub
+        CMAKE_CONFIGURATION: macos_arm64_xcode_ub
         CMAKE_GENERATOR: Xcode
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
-- 
cgit v0.12