mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-01 03:21:41 +00:00
allow macos11xcode12 to fail for now; but not macos10.15xcode11; add support for macos10.14_xcode10; make sure fontconfig does not update other stuff
This commit is contained in:
parent
a1bc10888c
commit
4129cc244c
@ -147,6 +147,7 @@ Debian_Clang_tests:
|
||||
macOS11_Xcode12:
|
||||
extends: .MacOS
|
||||
image: macos-11-xcode-12
|
||||
allow_failure: true
|
||||
cache:
|
||||
key: macOS11_Xcode12.v1
|
||||
variables:
|
||||
@ -155,12 +156,19 @@ macOS11_Xcode12:
|
||||
macOS10.15_Xcode11:
|
||||
extends: .MacOS
|
||||
image: macos-10.15-xcode-11
|
||||
allow_failure: true
|
||||
cache:
|
||||
key: macOS10.15_Xcode11.v1
|
||||
variables:
|
||||
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
|
||||
targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard"
|
||||
package: "Engine"
|
||||
|
@ -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
|
||||
|
||||
# additional libraries
|
||||
brew install fontconfig
|
||||
[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew install fontconfig
|
Loading…
Reference in New Issue
Block a user