diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-01-12 02:14:45 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-01-12 02:14:51 +0100 |
| commit | 9ec1330b455c1ab2eb6b89f8a2ab885677d4ae8a (patch) | |
| tree | 7ec8fd60b8fcf0aa8350c1166b41a6c94dff4c57 | |
| parent | 0b738075bd43fbd4410e30a51e0498cbfd2b7513 (diff) | |
| parent | faaf3ca0af683bc6317ff4d1524eb506ab1b2ac8 (diff) | |
Merge #9416: travis: make distdir before make
faaf3ca travis: make distdir before make (MarcoFalke)
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 6570e6571b..4087a854b4 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 |