From 76f8123e37a91a6780d4b8ff3ea6f8eaf7bb1691 Mon Sep 17 00:00:00 2001 From: ruben Date: Thu, 21 May 2020 12:19:09 +0100 Subject: [PATCH] Migrated CIs to use Boost 1.73.0 --- .appveyor.yml | 6 ++++++ .travis.yml | 3 --- ci/build_unix.sh | 36 ++++++++++++++++++++++++++++++++---- 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index a14c10bf..c8ff413c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -16,6 +16,12 @@ matrix: fast_finish: true build_script: + - mkdir C:\boost_1_73_0 + - git clone https://github.com/anarthal/boost-unix-mirror.git boost-latest + - cd boost-latest + - .\bootstrap.bat --prefix=C:\boost_1_73_0 + - .\b2 --prefix=C:\boost_1_73_0 --with-system --with-context --with-coroutine --with-date_time -d0 install + - cd .. - cp ci\ca-cert.pem C:\ - cp ci\server-cert.pem C:\ - cp ci\server-key.pem C:\ diff --git a/.travis.yml b/.travis.yml index 7d82c71b..cffdefb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,7 @@ __linux_addons_defaults: &__linux_addons_defaults apt: update: true - sources: - - sourceline: 'ppa:mhier/libboost-latest' packages: - - boost1.70 - python3 - valgrind - lcov diff --git a/ci/build_unix.sh b/ci/build_unix.sh index d590a0e6..7cd43c21 100644 --- a/ci/build_unix.sh +++ b/ci/build_unix.sh @@ -6,6 +6,36 @@ # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # +# Get latest cmake +function get_cmake { + CMAKE_ROOT=/opt/cmake-latest + sudo mkdir $CMAKE_ROOT + sudo chmod 777 $CMAKE_ROOT + wget https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh -q -O cmake-latest.sh + mkdir -p $CMAKE_ROOT + bash cmake-latest.sh --prefix=$CMAKE_ROOT --skip-license + export PATH=$CMAKE_ROOT/bin:$PATH +} + +# Build latest boost +function build_boost { + BOOST_ROOT=/opt/boost_1_73_0 + sudo mkdir $BOOST_ROOT + sudo chmod 777 $BOOST_ROOT + git clone https://github.com/anarthal/boost-unix-mirror.git boost-latest + cd boost-latest + ./bootstrap.sh --prefix=$BOOST_ROOT + ./b2 --prefix=$BOOST_ROOT \ + --with-system \ + --with-context \ + --with-coroutine \ + --with-date_time \ + -d0 \ + toolset=$TRAVIS_COMPILER \ + install + cd .. + export LD_LIBRARY_PATH=$BOOST_ROOT/lib:$LD_LIBRARY_PATH +} # SHA256 functionality is only supported in MySQL 8+. From our # CI systems, only OSX has this version. @@ -24,12 +54,10 @@ if [ $TRAVIS_OS_NAME == "osx" ]; then else sudo cp ci/unix-ci.cnf /etc/mysql/conf.d/ sudo service mysql restart - wget https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh -q -O cmake-latest.sh - mkdir -p /tmp/cmake-latest - bash cmake-latest.sh --prefix=/tmp/cmake-latest --skip-license - export PATH=/tmp/cmake-latest/bin:$PATH + get_cmake # OSX cmake is good enough fi +build_boost mkdir -p build cd build