do not build a few things; temporary disable checking package; get things compiling and cached first

pull/2945/head
Bret Curtis 5 years ago
parent 1e23d007dd
commit 3ea576efdc

@ -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}"

@ -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

@ -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" \
..

Loading…
Cancel
Save