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

gitlab-ci: Move macOS+Xcode universal binaries job to arm64

Browse Source 
Over time we are adding `arm64` hosts and removing `x86_64` hosts.
This commit is contained in:
Brad King 2023-05-09 11:19:50 -04:00
parent 5210b98ec2
commit 3a20a5f149
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

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

0
.gitlab/ci/configure_macos_x86_64_xcode_ub.cmake → .gitlab/ci/configure_macos_arm64_xcode_ub.cmake
View File

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

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

1
.gitlab/ci/env_macos_x86_64_xcode_ub.cmake
View File

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

4
.gitlab/os-macos.yml
View File

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