Set CI boost min/default to 1.67 (#1791)

This commit is contained in:
Russel Waters 2019-02-27 12:40:10 -05:00 committed by GitHub
commit 113c5c7823
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions

View file

@ -155,7 +155,7 @@ if (BOOST_ROOT)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
endif ()
find_package (Boost 1.66.0 REQUIRED COMPONENTS filesystem log thread program_options system)
find_package (Boost 1.67.0 REQUIRED COMPONENTS filesystem log thread program_options system)
add_subdirectory(crypto/ed25519-donna)

View file

@ -17,7 +17,7 @@ install:
- cmd: >-
git submodule update --init --recursive
cmake -DNANO_GUI=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DACTIVE_NETWORK=%NETWORK% -DQt5_DIR="C:\Qt\5.9\msvc2017_64\lib\cmake\Qt5" -DNANO_SIMD_OPTIMIZATIONS=TRUE -DBoost_COMPILER="-vc141" -DBOOST_ROOT="C:/Libraries/boost_1_66_0" -DBOOST_LIBRARYDIR="C:/Libraries/boost_1_66_0/lib64-msvc-14.1" -G "Visual Studio 15 2017 Win64" -DIPHLPAPI_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/iphlpapi.lib" -DWINSOCK2_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/WS2_32.lib" .
cmake -DNANO_GUI=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DACTIVE_NETWORK=%NETWORK% -DQt5_DIR="C:\Qt\5.9\msvc2017_64\lib\cmake\Qt5" -DNANO_SIMD_OPTIMIZATIONS=TRUE -DBoost_COMPILER="-vc141" -DBOOST_ROOT="C:/Libraries/boost_1_67_0" -DBOOST_LIBRARYDIR="C:/Libraries/boost_1_67_0/lib64-msvc-14.1" -G "Visual Studio 15 2017 Win64" -DIPHLPAPI_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/iphlpapi.lib" -DWINSOCK2_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/WS2_32.lib" .
- ps: Invoke-WebRequest -Uri https://aka.ms/vs/15/release/vc_redist.x64.exe -OutFile .\vc_redist.x64.exe
build:

View file

@ -11,7 +11,7 @@ RUN apt-get update -qq && apt-get install -yqq \
ENV BOOST_ROOT=/usr/local
ADD util/build_prep/bootstrap_boost.sh bootstrap_boost.sh
RUN ./bootstrap_boost.sh -m -B 1.66
RUN ./bootstrap_boost.sh -m
RUN rm bootstrap_boost.sh
RUN apt-get update -qq && apt-get install -yqq \

View file

@ -9,7 +9,7 @@ debugLevel=0
buildCArgs=()
buildCXXArgs=()
buildLDArgs=()
boostVersion='1.69'
boostVersion='1.67'
while getopts 'hmcCkpvB:' OPT; do
case "${OPT}" in
h)
@ -73,10 +73,10 @@ if [ "${useClang}" = 'true' ]; then
fi
case "${boostVersion}" in
1.66)
BOOST_BASENAME=boost_1_66_0
BOOST_URL=https://downloads.sourceforge.net/project/boost/boost/1.66.0/${BOOST_BASENAME}.tar.bz2
BOOST_ARCHIVE_SHA256='5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'
1.67)
BOOST_BASENAME=boost_1_67_0
BOOST_URL=https://downloads.sourceforge.net/project/boost/boost/1.67.0/${BOOST_BASENAME}.tar.bz2
BOOST_ARCHIVE_SHA256='2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba'
;;
1.69)
BOOST_BASENAME=boost_1_69_0

View file

@ -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.65.999; then
echo "boost version too low (1.66.0+ required)" >&2
if ! version_min 'boost --version' 1.66.999; then
echo "boost version too low (1.67.0+ required)" >&2
exit 1
fi

View file

@ -50,8 +50,8 @@ if ! have boost; then
exit 1
fi
if ! version_min 'boost --version' 1.65.999; then
echo "boost version too low (1.66.0+ required)" >&2
if ! version_min 'boost --version' 1.66.999; then
echo "boost version too low (1.67.0+ required)" >&2
exit 1
fi

View file

@ -29,8 +29,8 @@ if ! have boost; then
exit 1
fi
if ! version_min 'boost --version' 1.65.999; then
echo "boost version too low (1.66.0+ required)" >&2
if ! version_min 'boost --version' 1.66.999; then
echo "boost version too low (1.67.0+ required)" >&2
exit 1
fi
boost_dir="$(boost --install-prefix)"