From 3ea576efdc014e89258b77d3d1037f8f18297f51 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 3 Jul 2020 23:24:54 +0200 Subject: [PATCH] do not build a few things; temporary disable checking package; get things compiling and cached first --- .travis.yml | 2 +- CI/before_install.osx.sh | 2 -- CI/before_script.osx.sh | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5fec5a8308..cfc4494346 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ script: - cd ./build - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ${ANALYZE} make -j3; fi - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi - - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then ../CI/check_package.osx.sh; fi +# - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then ../CI/check_package.osx.sh; fi - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi - cd "${TRAVIS_BUILD_DIR}" diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 0f69ecb396..5dae1f1021 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -1,7 +1,5 @@ #!/bin/sh -e -brew update -brew outdated pkgconfig || brew upgrade pkgconfig brew install ccache curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-ef2462c.zip -o ~/openmw-deps.zip diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index 7ba21b23b1..7438c6c7af 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -18,5 +18,8 @@ cmake \ -D CMAKE_BUILD_TYPE=DEBUG \ -D OPENMW_OSX_DEPLOYMENT=TRUE \ -D BUILD_ESMTOOL=FALSE \ +-D BUILD_BSATOOL=FALSE \ +-D BUILD_ESSIMPORTER=FALSE \ +-D BUILD_NIFTEST=FALSE \ -G"Unix Makefiles" \ ..