diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-09-11 07:59:22 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-09-11 07:59:26 +0200 |
| commit | 16e41844e7d6c5876d2caaeef6010656950c6ec5 (patch) | |
| tree | 419878b32ecc3c50b8b2c40cc82f522443e07a26 | |
| parent | ee50c9e48786dea0d9df2e45805c25565c100fe3 (diff) | |
| parent | b73628d5a8e259a7f1fee5c4a245b463990f05a5 (diff) | |
Merge #11297: Make sure ~/.bitcoin doesn't exist before build
b73628d5a Make sure ~/.bitcoin doesn't exist before build (MeshCollider)
Pull request description:
We've been getting some random travis failures since https://github.com/bitcoin/bitcoin/pull/11260 was merged, because the `~/.bitcoin` directory exists after tests are run. Not sure exactly what's causing it, but this PR ensures the directory doesn't exist before running the build and tests, to see if this fixes the issue.
Edit: travis has been run on this merge twice, and all tests passed both times, so either this fixes the issue or it just got lucky
Tree-SHA512: d48e594cfc19a16f4c6e360ec78956ff4274169e92fac4602ab0b980de32875c1e9d3cb24a40c708b5334dbbf8bf55a8003121591bdb5f3fdd256d63e1235aa8
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index f1b10d3bd1..7cc320dddb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ before_script: - if [ "$CHECK_DOC" = 1 -a "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then contrib/devtools/commit-script-check.sh $TRAVIS_COMMIT_RANGE; fi - if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi - unset CC; unset CXX + - rm -rf ~/.bitcoin - mkdir -p depends/SDKs depends/sdk-sources - if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi - if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi |