gitlab-ci: Add nightly jobs covering macOS universal binaries on x86_64

.gitlab-ci.yml

@@ -912,6 +912,34 @@ t:macos-arm64-xcode:
     variables:
         CMAKE_CI_NO_MR: "true"
 
+t:macos-x86_64-ninja-ub:
+    extends:
+        - .macos_x86_64_ninja_ub
+        - .cmake_test_macos_external
+        - .macos_x86_64_tags_ext
+        - .cmake_junit_artifacts
+        - .run_dependent
+    dependencies:
+        - t:macos-x86_64-ninja
+    needs:
+        - t:macos-x86_64-ninja
+    variables:
+        CMAKE_CI_JOB_NIGHTLY: "true"
+
+t:macos-x86_64-xcode-ub:
+    extends:
+        - .macos_x86_64_xcode_ub
+        - .cmake_test_macos_external
+        - .macos_x86_64_tags_ext
+        - .cmake_junit_artifacts
+        - .run_dependent
+    dependencies:
+        - t:macos-x86_64-ninja
+    needs:
+        - t:macos-x86_64-ninja
+    variables:
+        CMAKE_CI_JOB_NIGHTLY: "true"
+
 b:macos-package:
     extends:
         - .macos_package

.gitlab/ci/configure_macos_x86_64_ninja_ub.cmake

@@ -0,0 +1,2 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")

.gitlab/ci/configure_macos_x86_64_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")

.gitlab/ci/env_macos_x86_64_ninja_ub.cmake

@@ -0,0 +1 @@
+set(ENV{CMAKE_OSX_ARCHITECTURES} "x86_64;arm64")

.gitlab/ci/env_macos_x86_64_xcode_ub.cmake

@@ -0,0 +1 @@
+set(ENV{CMAKE_OSX_ARCHITECTURES} "x86_64;arm64")

.gitlab/os-macos.yml

@@ -80,6 +80,14 @@
         CMAKE_GENERATOR: Xcode
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
+.macos_x86_64_xcode_ub:
+    extends: .macos
+
+    variables:
+        CMAKE_CONFIGURATION: macos_x86_64_xcode_ub
+        CMAKE_GENERATOR: Xcode
+        CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
+
 .macos_x86_64_ninja_multi:
     extends: .macos
 
@@ -88,6 +96,13 @@
         CMAKE_GENERATOR: "Ninja Multi-Config"
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
+.macos_x86_64_ninja_ub:
+    extends: .macos
+
+    variables:
+        CMAKE_CONFIGURATION: macos_x86_64_ninja_ub
+        CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
+
 ## Tags
 
 .macos_x86_64_tags: