From ead450f0968bbeb4f5ad24e2435ce174399b4500 Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Tue, 19 May 2020 11:37:20 -0400 Subject: [PATCH 1/7] Move bootstrap_boost script to 1.69 add 1.72 and 1.73 for convenience --- util/build_prep/bootstrap_boost.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/util/build_prep/bootstrap_boost.sh b/util/build_prep/bootstrap_boost.sh index 660053368a..1caddc25fb 100755 --- a/util/build_prep/bootstrap_boost.sh +++ b/util/build_prep/bootstrap_boost.sh @@ -11,7 +11,7 @@ buildThreads=1 buildCArgs=() buildCXXArgs=() buildLDArgs=() -boostVersion='1.67' +boostVersion='1.69' while getopts 'hmscCkpvB:j:' OPT; do case "${OPT}" in h) @@ -83,11 +83,6 @@ if [ "${useClang}" = 'true' ]; then fi case "${boostVersion}" in - 1.67) - BOOST_BASENAME=boost_1_67_0 - BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.67.0/${BOOST_BASENAME}.tar.bz2/download - BOOST_ARCHIVE_SHA256='2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba' - ;; 1.69) BOOST_BASENAME=boost_1_69_0 BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.69.0/${BOOST_BASENAME}.tar.bz2/download @@ -98,6 +93,16 @@ case "${boostVersion}" in BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.70.0/${BOOST_BASENAME}.tar.bz2/download BOOST_ARCHIVE_SHA256='430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778' ;; + 1.72) + BOOST_BASENAME=boost_1_72_0 + BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.72.0/${BOOST_BASENAME}.tar.bz2/download + BOOST_ARCHIVE_SHA256='59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722' + ;; + 1.73) + BOOST_BASENAME=boost_1_73_0 + BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.73.0/${BOOST_BASENAME}.tar.bz2/download + BOOST_ARCHIVE_SHA256='4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402' + ;; *) echo "Unsupported Boost version: ${boostVersion}" >&2 exit 1 From 39cbb7456494ca92ef51b9c95d3c2dfe612478f8 Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Tue, 19 May 2020 11:47:41 -0400 Subject: [PATCH 2/7] catch CMakeLists check for 1.69+ --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ef9ea025e..b50fd1c645 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -255,7 +255,7 @@ set(Boost_USE_MULTITHREADED ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules") -find_package (Boost 1.67.0 REQUIRED COMPONENTS filesystem log log_setup thread program_options system) +find_package (Boost 1.69.0 REQUIRED COMPONENTS filesystem log log_setup thread program_options system) if (NANO_ROCKSDB) find_package (RocksDB REQUIRED) From eac61d62a9d976d0f6717c4dae26a842b197469b Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Tue, 19 May 2020 11:50:02 -0400 Subject: [PATCH 3/7] catch build_prep scripts if used --- util/build_prep/centos/prep.sh.in | 4 ++-- util/build_prep/macosx/prep.sh.in | 4 ++-- util/build_prep/ubuntu/prep.sh.in | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/util/build_prep/centos/prep.sh.in b/util/build_prep/centos/prep.sh.in index 3786ea6a4b..9299f62172 100644 --- a/util/build_prep/centos/prep.sh.in +++ b/util/build_prep/centos/prep.sh.in @@ -28,8 +28,8 @@ yes | yum install -y llvm-toolset-7-cmake devtoolset-7-llvm|| exit 1 exit 1 fi - if ! version_min 'boost --version' 1.66.999; then - echo "boost version too low (1.67.0+ required)" >&2 + if ! version_min 'boost --version' 1.68.999; then + echo "boost version too low (1.69.0+ required)" >&2 exit 1 fi diff --git a/util/build_prep/macosx/prep.sh.in b/util/build_prep/macosx/prep.sh.in index d9ff2641c4..ea330278d0 100644 --- a/util/build_prep/macosx/prep.sh.in +++ b/util/build_prep/macosx/prep.sh.in @@ -50,8 +50,8 @@ if ! have boost; then exit 1 fi -if ! version_min 'boost --version' 1.66.999; then - echo "boost version too low (1.67.0+ required)" >&2 +if ! version_min 'boost --version' 1.68.999; then + echo "boost version too low (1.69.0+ required)" >&2 exit 1 fi diff --git a/util/build_prep/ubuntu/prep.sh.in b/util/build_prep/ubuntu/prep.sh.in index bf8233be75..b4dbb78f06 100644 --- a/util/build_prep/ubuntu/prep.sh.in +++ b/util/build_prep/ubuntu/prep.sh.in @@ -29,8 +29,8 @@ if ! have boost; then exit 1 fi -if ! version_min 'boost --version' 1.66.999; then - echo "boost version too low (1.67.0+ required)" >&2 +if ! version_min 'boost --version' 1.68.999; then + echo "boost version too low (1.69.0+ required)" >&2 exit 1 fi boost_dir="$(boost --install-prefix)" From 8a3d9209ab3e9b814ae624303a9990bd124fcf3c Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Tue, 19 May 2020 12:47:52 -0400 Subject: [PATCH 4/7] update fetch_boost to use 1.70 url --- util/build_prep/fetch_boost.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/build_prep/fetch_boost.sh b/util/build_prep/fetch_boost.sh index 0f1a88b640..11f77a9330 100755 --- a/util/build_prep/fetch_boost.sh +++ b/util/build_prep/fetch_boost.sh @@ -4,8 +4,8 @@ OS=`uname` TRAVIS_COMPILER="${TRAVIS_COMPILER:-clang}" pushd /tmp -wget -O boost-$OS-$TRAVIS_COMPILER-latest.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$TRAVIS_COMPILER-latest.tgz -tar -zxf boost-$OS-$TRAVIS_COMPILER-latest.tgz +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 mv tmp/* . rm -fr tmp popd From 66dde97bb634dbc4d668662447c6ab34ff0a3a27 Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Tue, 19 May 2020 13:31:43 -0400 Subject: [PATCH 5/7] update nano-pow-server submodule to boost 1.69 minimum commit --- nano-pow-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nano-pow-server b/nano-pow-server index 32e7826865..1279afc2b6 160000 --- a/nano-pow-server +++ b/nano-pow-server @@ -1 +1 @@ -Subproject commit 32e7826865ce4af069f79eceeefe2a1092e28b53 +Subproject commit 1279afc2b6a5382c708d642d8c190bf0f68d340e From 152f2cda1fe56c631279620b51d105b5b678caea Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Tue, 19 May 2020 14:53:44 -0400 Subject: [PATCH 6/7] update clang/clang-6 docker images to use cached boost artifacts macOS updated to used cached boost artifacts Rename variable --- ci/actions/osx/install_deps.sh | 2 +- docker/ci/Dockerfile-clang | 4 ++-- docker/ci/Dockerfile-clang-6 | 4 ++-- docker/ci/Dockerfile-gcc | 2 +- util/build_prep/fetch_boost.sh | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) 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 From 820b1758d2408639eae59e5d61510cb015dfeae2 Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Tue, 19 May 2020 15:39:01 -0400 Subject: [PATCH 7/7] split into separate commands to debug why qt is not being grabbed --- ci/actions/osx/install_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/actions/osx/install_deps.sh b/ci/actions/osx/install_deps.sh index 8f14011694..8f740877cb 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/fetch_boost.sh && \ +sudo util/build_prep/fetch_boost.sh util/build_prep/macosx/build_qt.sh