aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <[email protected]>2016-12-21 13:55:56 +0100
committerMarcoFalke <[email protected]>2017-01-11 12:25:05 +0100
commitfaaf3ca0af683bc6317ff4d1524eb506ab1b2ac8 (patch)
tree2a090caf1c62525111b3d4826286791591001f50
parentbuild: fix for out-of-tree/distdir qt builds (diff)
downloaddiscoin-faaf3ca0af683bc6317ff4d1524eb506ab1b2ac8.tar.xz
discoin-faaf3ca0af683bc6317ff4d1524eb506ab1b2ac8.zip
travis: make distdir before make
-rw-r--r--.travis.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 6570e6571..4087a854b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,9 +58,11 @@ script:
- depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE
- test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
- mkdir build && cd build
- - ../configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
+ - ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
+ - make distdir VERSION=$HOST
+ - cd bitcoin-$HOST
+ - ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
- make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
- - make distdir
- export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
- if [ "$RUN_TESTS" = "true" ]; then make $MAKEJOBS check VERBOSE=1; fi
- if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi