diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-06-14 12:07:26 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-06-14 12:07:29 -0400 |
| commit | f6f924811d5b4ae2a6c77105403747cd31d3e49d (patch) | |
| tree | d7a3f93ecd81669f5d34a6d69523ed26d759ac99 | |
| parent | 7524376a81a1955f4da4adb23005f2122b18a270 (diff) | |
| parent | 88884c6f7545e428e4c30b1cfd0a6d1ad39abf5d (diff) | |
| download | bitcoin-f6f924811d5b4ae2a6c77105403747cd31d3e49d.tar.xz | |
Merge #16214: travis: Fix caching issues
88884c6f75 travis: Use absolute paths for cache dirs (MarcoFalke)
fae9d54abc travis: Fix caching issues (MarcoFalke)
Pull request description:
It appears that the travis caching infrastructure changed under us without any notice. I believe we can no longer use relative paths as cache paths, unless:
* we go back to the root travis build dir before the caching step, or
* we specify absolute paths for caching
Apply both fixes here.
Thanks to **promag** for helping me debug this: https://github.com/bitcoin/bitcoin/issues/16148#issuecomment-502078938
ACKs for commit 88884c:
Empact:
ACK https://github.com/bitcoin/bitcoin/pull/16214/commits/88884c6f7545e428e4c30b1cfd0a6d1ad39abf5d
Tree-SHA512: 04f2987aade4e8bb016862ba81aea4bb90573a0bf0d2e51b0411c6e3687ee8ec3b639627c0950f51bc8ae4bbf5e0799672c9a81dfb03f01eb5b08791ba857a4a
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | .travis/test_06_script_b.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index c281d3ed70..adf2140642 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,8 @@ language: minimal cache: ccache: true directories: - - depends/built - - depends/sdk-sources + - $TRAVIS_BUILD_DIR/depends/built + - $TRAVIS_BUILD_DIR/depends/sdk-sources - $HOME/.ccache stages: - lint diff --git a/.travis/test_06_script_b.sh b/.travis/test_06_script_b.sh index 0420acb993..e40055a6ee 100755 --- a/.travis/test_06_script_b.sh +++ b/.travis/test_06_script_b.sh @@ -25,3 +25,5 @@ if [ "$RUN_FUZZ_TESTS" = "true" ]; then DOCKER_EXEC test/fuzz/test_runner.py -l DEBUG ${DIR_FUZZ_IN} END_FOLD fi + +cd ${TRAVIS_BUILD_DIR} || (echo "could not enter travis build dir $TRAVIS_BUILD_DIR"; exit 1) |