diff --git a/.travis.yml b/.travis.yml index e135852c39..36b0c8e24e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -192,7 +192,7 @@ after_success: - stage: lint name: 'lint' env: - cache: false + cache: pip language: python python: '3.8' # Oldest supported version according to doc/dependencies.md install: diff --git a/ci/dash/build_src.sh b/ci/dash/build_src.sh index c12bb895e1..328acc07d8 100755 --- a/ci/dash/build_src.sh +++ b/ci/dash/build_src.sh @@ -31,6 +31,7 @@ if [ "$CHECK_DOC" = 1 ]; then test/lint/extended-lint-all.sh fi +command -v ccache > /dev/null && ccache --zero-stats ccache --max-size=$CCACHE_SIZE if [ -n "$CONFIG_SHELL" ]; then @@ -53,6 +54,8 @@ cd dashcore-$BUILD_TARGET make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false ) +command -v ccache > /dev/null && ccache --version | head -n 1 && ccache --show-stats + if [ -n "$USE_VALGRIND" ]; then echo "valgrind in USE!" ${BASE_ROOT_DIR}/ci/test/wrap-valgrind.sh diff --git a/ci/test/00_setup_env.sh b/ci/test/00_setup_env.sh index 3311a78524..5b4da6b81b 100755 --- a/ci/test/00_setup_env.sh +++ b/ci/test/00_setup_env.sh @@ -29,7 +29,7 @@ MAKEJOBS="-j$(nproc)" export MAKEJOBS # A folder for the ci system to put temporary files (ccache, datadirs for tests, ...) # This folder only exists on the ci host. -export BASE_SCRATCH_DIR=${BASE_SCRATCH_DIR:-$BASE_ROOT_DIR/ci/scratch/} +export BASE_SCRATCH_DIR=${BASE_SCRATCH_DIR:-$BASE_ROOT_DIR/ci/scratch} # What host to compile for. See also ./depends/README.md # Tests that need cross-compilation export the appropriate HOST. # Tests that run natively guess the host @@ -60,7 +60,6 @@ export DEPENDS_DIR=${DEPENDS_DIR:-$BASE_ROOT_DIR/depends} # Folder where the build is done (bin and lib). export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out/$HOST} export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks} -export WINEDEBUG=${WINEDEBUG:-fixme-all} export DOCKER_PACKAGES=${DOCKER_PACKAGES:-build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git procps} export GOAL=${GOAL:-install} export DIR_QA_ASSETS=${DIR_QA_ASSETS:-${BASE_SCRATCH_DIR}/qa-assets} diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index 68c48dfae4..99fec18e16 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -25,7 +25,7 @@ export ASAN_OPTIONS="detect_stack_use_after_return=1:check_initialization_order= export LSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/lsan" export TSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/tsan" export UBSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1" -env | grep -E '^(BASE_|QEMU_|CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL|(ASAN|LSAN|TSAN|UBSAN)_OPTIONS)' | tee /tmp/env +env | grep -E '^(BASE_|QEMU_|CCACHE_|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL|(ASAN|LSAN|TSAN|UBSAN)_OPTIONS)' | tee /tmp/env if [[ $HOST = *-mingw32 ]]; then DOCKER_ADMIN="--cap-add SYS_ADMIN" elif [[ $BITCOIN_CONFIG = *--with-sanitizers=*address* ]]; then # If ran with (ASan + LSan), Docker needs access to ptrace (https://github.com/google/sanitizers/issues/764)