From 57c7f2517c81e8246ae9d3c1b0375aa372969697 Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Tue, 26 May 2020 16:41:49 -0400 Subject: [PATCH] use full cache for PR's requesting modules not currently specified in minimal (#2790) fix gcc dockerfile --- docker/ci/Dockerfile-gcc | 2 +- util/build_prep/fetch_boost.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/ci/Dockerfile-gcc b/docker/ci/Dockerfile-gcc index 5ffc63ed..8b588f22 100644 --- a/docker/ci/Dockerfile-gcc +++ b/docker/ci/Dockerfile-gcc @@ -7,6 +7,6 @@ RUN ./fetch_rocksdb.sh ENV BOOST_ROOT=/tmp/boost -ADD util/build_prep/bootstrap_boost.sh bootstrap_boost.sh +ADD util/build_prep/fetch_boost.sh fetch_boost.sh RUN COMPILER=gcc ./fetch_boost.sh diff --git a/util/build_prep/fetch_boost.sh b/util/build_prep/fetch_boost.sh index a681d5df..86631437 100755 --- a/util/build_prep/fetch_boost.sh +++ b/util/build_prep/fetch_boost.sh @@ -4,8 +4,8 @@ OS=`uname` COMPILER="${COMPILER:-clang}" pushd /tmp -wget -O boost-$OS-$COMPILER-1.70.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$COMPILER-1.70.tgz -tar -zxf boost-$OS-$COMPILER-1.70.tgz +wget -O boost-$OS-$COMPILER.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$COMPILER-1.70-full.tgz +tar -zxf boost-$OS-$COMPILER.tgz mv tmp/* . rm -fr tmp popd