mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-28 14:11:34 +00:00
Code Issues Releases Wiki Activity

[CI] Attempt to add intel mac builds with separate build step

Browse source
This commit is contained in:
Sarah Sunday 2025-06-14 14:10:28 -05:00
parent acd4e77a85
commit 608831265c
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.gitlab-ci.yml
View file

@ -534,6 +534,17 @@ Ubuntu_GCC_integration_tests_asan:
paths: paths:
- build/OpenMW-*.dmg - build/OpenMW-*.dmg
macOS14_Xcode15_x86-64:
extends: .MacOS
image: macos-14-xcode-15
tags:
- saas-macos-medium-m1
cache:
key: macOS14_Xcode15_x86-64.v1
variables:
CCACHE_SIZE: 3G
MACOS_X86_64: true
macOS14_Xcode15_arm64: macOS14_Xcode15_arm64:
extends: .MacOS extends: .MacOS
image: macos-14-xcode-15 image: macos-14-xcode-15

2
CI/before_install.osx.sh
View file

@ -20,7 +20,7 @@ ccache --version
cmake --version cmake --version
qmake --version qmake --version
if [[ "${MACOS_AMD64}" ]]; then if [[ "${MACOS_X86_64}" ]]; then
curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20240802.zip -o ~/openmw-deps.zip curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20240802.zip -o ~/openmw-deps.zip
unzip -o ~/openmw-deps.zip -d /tmp > /dev/null unzip -o ~/openmw-deps.zip -d /tmp > /dev/null
else else

6
CI/before_script.osx.sh
View file

@ -29,6 +29,12 @@ declare -a CMAKE_CONF_OPTS=(
-D OPENMW_OSX_DEPLOYMENT=TRUE -D OPENMW_OSX_DEPLOYMENT=TRUE
) )
if [[ "${MACOS_X86_64}" ]]; then
CMAKE_CONF_OPTS+=(
-D CMAKE_OSX_ARCHITECTURES="x86_64"
)
fi
if [[ "${CMAKE_BUILD_TYPE}" ]]; then if [[ "${CMAKE_BUILD_TYPE}" ]]; then
CMAKE_CONF_OPTS+=( CMAKE_CONF_OPTS+=(
-D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}