mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 16:15:31 +00:00
Code Issues Releases Wiki Activity

allow macos11xcode12 to fail for now; but not macos10.15xcode11; add support for macos10.14_xcode10; make sure fontconfig does not update other stuff

Browse source
This commit is contained in:
Bret Curtis 2021-05-05 13:35:39 +02:00
parent a1bc10888c
commit 4129cc244c
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -147,6 +147,7 @@ Debian_Clang_tests:
macOS11_Xcode12: macOS11_Xcode12:
extends: .MacOS extends: .MacOS
image: macos-11-xcode-12 image: macos-11-xcode-12
allow_failure: true
cache: cache:
key: macOS11_Xcode12.v1 key: macOS11_Xcode12.v1
variables: variables:
@ -155,12 +156,19 @@ macOS11_Xcode12:
macOS10.15_Xcode11: macOS10.15_Xcode11:
extends: .MacOS extends: .MacOS
image: macos-10.15-xcode-11 image: macos-10.15-xcode-11
allow_failure: true
cache: cache:
key: macOS10.15_Xcode11.v1 key: macOS10.15_Xcode11.v1
variables: variables:
CCACHE_SIZE: 3G CCACHE_SIZE: 3G
macOS10.14_Xcode10:
extends: .MacOS
image: macos-10.14-xcode-10
cache:
key: macOS10.14_Xcode10.v1
variables:
CCACHE_SIZE: 3G
variables: &engine-targets variables: &engine-targets
targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard" targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard"
package: "Engine" package: "Engine"

2
CI/before_install.osx.sh
View file

@ -19,4 +19,4 @@ curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-8f5ef6
unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
# additional libraries # additional libraries
brew install fontconfig [ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew install fontconfig