diff --git a/ci/actions/osx/install_deps.sh b/ci/actions/osx/install_deps.sh index dae3c43498..8f14011694 100755 --- a/ci/actions/osx/install_deps.sh +++ b/ci/actions/osx/install_deps.sh @@ -8,5 +8,5 @@ if [[ ${TEST-0} -eq 1 ]]; then else util/build_prep/fetch_rocksdb.sh fi -util/build_prep/bootstrap_boost.sh -m -c -B 1.70 && \ +util/build_prep/fetch_boost.sh && \ util/build_prep/macosx/build_qt.sh diff --git a/docker/ci/Dockerfile-clang b/docker/ci/Dockerfile-clang index dd6cfdab3c..41f5e70cea 100644 --- a/docker/ci/Dockerfile-clang +++ b/docker/ci/Dockerfile-clang @@ -14,8 +14,8 @@ RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100 RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100 ENV BOOST_ROOT=/tmp/boost -ADD util/build_prep/bootstrap_boost.sh bootstrap_boost.sh -RUN ./bootstrap_boost.sh -m -c -B 1.70 +ADD util/build_prep/fetch_boost.sh fetch_boost.sh +RUN ./fetch_boost.sh # workaround to get a path that can be easily passed into cmake for # BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE diff --git a/docker/ci/Dockerfile-clang-6 b/docker/ci/Dockerfile-clang-6 index c292050cdb..7c6b0355c0 100644 --- a/docker/ci/Dockerfile-clang-6 +++ b/docker/ci/Dockerfile-clang-6 @@ -17,6 +17,6 @@ RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100 RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100 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 ./bootstrap_boost.sh -m -c -B 1.70 +RUN COMPILER=clang-6 ./fetch_boost.sh diff --git a/docker/ci/Dockerfile-gcc b/docker/ci/Dockerfile-gcc index 9378cf3e67..8b588f2245 100644 --- a/docker/ci/Dockerfile-gcc +++ b/docker/ci/Dockerfile-gcc @@ -9,4 +9,4 @@ ENV BOOST_ROOT=/tmp/boost ADD util/build_prep/fetch_boost.sh fetch_boost.sh -RUN TRAVIS_COMPILER=gcc ./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 11f77a9330..a681d5df42 100755 --- a/util/build_prep/fetch_boost.sh +++ b/util/build_prep/fetch_boost.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash OS=`uname` -TRAVIS_COMPILER="${TRAVIS_COMPILER:-clang}" +COMPILER="${COMPILER:-clang}" pushd /tmp -wget -O boost-$OS-$TRAVIS_COMPILER-1.70.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$TRAVIS_COMPILER-1.70.tgz -tar -zxf boost-$OS-$TRAVIS_COMPILER-1.70.tgz +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 mv tmp/* . rm -fr tmp popd