Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set boost min to 1.69 #2779

Merged
merged 7 commits into from
May 22, 2020
Merged

Set boost min to 1.69 #2779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ead450f
Move bootstrap_boost script to 1.69
May 19, 2020
39cbb74
catch CMakeLists check for 1.69+
May 19, 2020
eac61d6
catch build_prep scripts if used
May 19, 2020
8a3d920
update fetch_boost to use 1.70 url
May 19, 2020
66dde97
update nano-pow-server submodule to boost 1.69 minimum commit
May 19, 2020
152f2cd
update clang/clang-6 docker images to use cached boost artifacts
May 19, 2020
820b175
split into separate commands to debug why qt is not being grabbed
May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ci/actions/osx/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
sudo util/build_prep/fetch_boost.sh
util/build_prep/macosx/build_qt.sh
4 changes: 2 additions & 2 deletions docker/ci/Dockerfile-clang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/ci/Dockerfile-clang-6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docker/ci/Dockerfile-gcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion nano-pow-server
Open in desktop
Submodule nano-pow-server updated 13 files
+71 −0 .github/workflows/artifacts.yml
+39 −0 .github/workflows/tests.yml
+3 −0 .gitmodules
+0 −50 .travis.yml
+24 −12 CMakeLists.txt
+7 −1 README.md
+49 −0 ci/actions/build.sh
+14 −0 ci/actions/deploy.sh
+19 −0 ci/actions/windows/build.ps1
+38 −0 ci/actions/windows/configure.bat
+6 −0 ci/actions/windows/deploy.ps1
+1 −0 deps/googletest
+26 −11 util/build_prep/bootstrap_boost.sh
17 changes: 11 additions & 6 deletions util/build_prep/bootstrap_boost.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions util/build_prep/centos/prep.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions util/build_prep/fetch_boost.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-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-$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
4 changes: 2 additions & 2 deletions util/build_prep/macosx/prep.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions util/build_prep/ubuntu/prep.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down