From 4129cc244c8bafb2542b2b899f6c185e7c96c690 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Wed, 5 May 2021 13:35:39 +0200 Subject: [PATCH] allow macos11xcode12 to fail for now; but not macos10.15xcode11; add support for macos10.14_xcode10; make sure fontconfig does not update other stuff --- .gitlab-ci.yml | 10 +++++++++- CI/before_install.osx.sh | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7a1a403fe..ea3b40b908 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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" diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 15c5012b80..ec19c73215 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -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 \ No newline at end of file +[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew install fontconfig \ No newline at end of file