mirror of
https://github.com/vcmi/vcmi.git
synced 2025-01-12 02:28:11 +02:00
Travis CI: fix coverity branch build and improve formatting
Also try to cache /usr/local/Cellar for OS X builds.
This commit is contained in:
parent
02ae95aca3
commit
41bb47ca0d
19
.travis.yml
19
.travis.yml
@ -13,6 +13,7 @@ cache:
|
|||||||
timeout: 500
|
timeout: 500
|
||||||
directories:
|
directories:
|
||||||
- $HOME/Library/Caches/Homebrew
|
- $HOME/Library/Caches/Homebrew
|
||||||
|
- /usr/local/Cellar
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
exclude:
|
exclude:
|
||||||
@ -64,13 +65,23 @@ before_install:
|
|||||||
before_script:
|
before_script:
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
- test $TRAVIS_BRANCH != coverity_scan || exit 0
|
- if [[ $TRAVIS_BRANCH != 'coverity_scan' ]];
|
||||||
- source $TRAVIS_BUILD_DIR/CI/get_package_name.sh
|
then
|
||||||
- cmake -G "Unix Makefiles" .. $VCMI_CMAKE_FLAGS -DPACKAGE_NAME_SUFFIX:STRING="$VCMI_PACKAGE_NAME_SUFFIX" -DPACKAGE_FILE_NAME:STRING="$VCMI_PACKAGE_FILE_NAME"
|
source $TRAVIS_BUILD_DIR/CI/get_package_name.sh;
|
||||||
|
cmake -G "Unix Makefiles" .. $VCMI_CMAKE_FLAGS
|
||||||
|
-DPACKAGE_NAME_SUFFIX:STRING="$VCMI_PACKAGE_NAME_SUFFIX"
|
||||||
|
-DPACKAGE_FILE_NAME:STRING="$VCMI_PACKAGE_FILE_NAME";
|
||||||
|
fi
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- test $TRAVIS_BRANCH != coverity_scan || exit 0
|
- test $TRAVIS_BRANCH != coverity_scan || exit 0
|
||||||
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then cd ..; xcodebuild -project osx/osx-vcmibuilder/vcmibuilder.xcodeproj/ -configuration Release CONFIGURATION_BUILD_DIR=..; cd build; fi
|
- if [[ $TRAVIS_OS_NAME == 'osx' ]];
|
||||||
|
then
|
||||||
|
cd ..;
|
||||||
|
xcodebuild -project osx/osx-vcmibuilder/vcmibuilder.xcodeproj/
|
||||||
|
-configuration Release CONFIGURATION_BUILD_DIR=..;
|
||||||
|
cd build;
|
||||||
|
fi
|
||||||
- make -j2
|
- make -j2
|
||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
|
Loading…
Reference in New Issue
Block a user