echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brad King 2023-02-21 10:15:45 -05:00
parent d3ea15e801
commit 557c3934ee
6 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.gitlab-ci.yml
View File

@ -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

2
.gitlab/ci/configure_macos_x86_64_ninja_ub.cmake Normal file
View File

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

2
.gitlab/ci/configure_macos_x86_64_xcode_ub.cmake Normal file
View File

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

1
.gitlab/ci/env_macos_x86_64_ninja_ub.cmake Normal file
View File

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

1
.gitlab/ci/env_macos_x86_64_xcode_ub.cmake Normal file
View File

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

15
.gitlab/os-macos.yml
View File

@ -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: