diff --git a/.github/workflows/beta_artifacts.yml b/.github/workflows/beta_artifacts.yml index edb67e28c..671d78b6a 100644 --- a/.github/workflows/beta_artifacts.yml +++ b/.github/workflows/beta_artifacts.yml @@ -54,8 +54,6 @@ jobs: needs: build_auto_setup_job runs-on: macOS-11 timeout-minutes: 90 - env: - BOOST_ROOT: /tmp/boost steps: - name: Set the tag and the pre-release version run: | diff --git a/.github/workflows/beta_artifacts_latest_release_branch.yml b/.github/workflows/beta_artifacts_latest_release_branch.yml index 02fc87820..0d1bdb6ca 100644 --- a/.github/workflows/beta_artifacts_latest_release_branch.yml +++ b/.github/workflows/beta_artifacts_latest_release_branch.yml @@ -45,8 +45,6 @@ jobs: needs: build_auto_setup_job runs-on: macOS-11 timeout-minutes: 90 - env: - BOOST_ROOT: /tmp/boost steps: - name: Set the tag and the pre-release version run: | diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 2623c8260..1079804f0 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -16,7 +16,6 @@ jobs: env: LCOV: 1 COMPILER: gcc - BOOST_ROOT: /tmp/boost runs-on: ubuntu-20.04 strategy: matrix: @@ -33,7 +32,6 @@ jobs: sudo apt-get update -qq && sudo apt-get install -yqq build-essential g++ wget python zlib1g-dev qt5-default \ valgrind xorg xvfb xauth xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic ocl-icd-opencl-dev \ git lcov python3-pip - util/build_prep/fetch_boost.sh wget -O cmake_install.sh https://github.com/Kitware/CMake/releases/download/v3.15.4/cmake-3.15.4-Linux-x86_64.sh chmod +x cmake_install.sh sudo ./cmake_install.sh --prefix=/usr --exclude-subdir --skip-license diff --git a/.github/workflows/live_artifacts.yml b/.github/workflows/live_artifacts.yml index cffe78e02..0f18ad095 100644 --- a/.github/workflows/live_artifacts.yml +++ b/.github/workflows/live_artifacts.yml @@ -17,8 +17,6 @@ jobs: osx_job: runs-on: macOS-11 timeout-minutes: 90 - env: - BOOST_ROOT: /tmp/boost steps: - name: tag run: | diff --git a/.github/workflows/test_network_artifacts.yml b/.github/workflows/test_network_artifacts.yml index 57dfffd32..9cdb1ba48 100644 --- a/.github/workflows/test_network_artifacts.yml +++ b/.github/workflows/test_network_artifacts.yml @@ -18,8 +18,6 @@ jobs: osx_job: runs-on: macOS-11 timeout-minutes: 90 - env: - BOOST_ROOT: /tmp/boost steps: - name: tag run: | diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index ec73be183..a3d65f69f 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -16,7 +16,6 @@ jobs: RELEASE: - ${{ startsWith(github.ref, 'refs/tags/') }} env: - BOOST_ROOT: /tmp/boost TEST_USE_ROCKSDB: ${{ matrix.TEST_USE_ROCKSDB }} RELEASE: ${{ matrix.RELEASE }} runs-on: macOS-11 diff --git a/ci/actions/osx/install_deps.sh b/ci/actions/osx/install_deps.sh index 6a89fc3d4..bef02a96f 100755 --- a/ci/actions/osx/install_deps.sh +++ b/ci/actions/osx/install_deps.sh @@ -3,5 +3,4 @@ brew update brew install coreutils brew cask install xquartz -sudo util/build_prep/fetch_boost.sh util/build_prep/macosx/build_qt.sh diff --git a/ci/build-ci.sh b/ci/build-ci.sh index 1823acf8e..74f2342dd 100755 --- a/ci/build-ci.sh +++ b/ci/build-ci.sh @@ -50,8 +50,6 @@ cmake \ -DNANO_WARN_TO_ERR=ON \ -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Debug} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ --DBOOST_ROOT=${BOOST_ROOT:-/tmp/boost/} \ --DNANO_SHARED_BOOST=ON \ -DQt5_DIR=${qt_dir} \ -DCI_TEST="1" \ ${BACKTRACE:-} \ diff --git a/ci/build-deploy.sh b/ci/build-deploy.sh index 086bf835f..25f716e90 100755 --- a/ci/build-deploy.sh +++ b/ci/build-deploy.sh @@ -31,8 +31,6 @@ cmake \ -DPORTABLE=1 \ -DCMAKE_BUILD_TYPE=${CONFIGURATION} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ --DBOOST_ROOT=/tmp/boost/ \ --DNANO_SHARED_BOOST=ON \ -DQt5_DIR=${qt_dir} \ -DCI_BUILD=true \ -DCI_VERSION_PRE_RELEASE="${ci_version_pre_release}" \ diff --git a/docker/ci/Dockerfile-base b/docker/ci/Dockerfile-base index 11e9fd638..1feccdee4 100644 --- a/docker/ci/Dockerfile-base +++ b/docker/ci/Dockerfile-base @@ -8,7 +8,8 @@ g++ \ wget \ python \ zlib1g-dev \ -cmake +cmake \ +git RUN apt-get update -qq && apt-get install -yqq \ qt5-default \ diff --git a/docker/ci/Dockerfile-clang b/docker/ci/Dockerfile-clang index f2db08354..4ab0c6601 100644 --- a/docker/ci/Dockerfile-clang +++ b/docker/ci/Dockerfile-clang @@ -3,9 +3,7 @@ FROM ${ENV_REPOSITORY}:base RUN apt-get update -qq && apt-get install -yqq \ clang \ -lldb \ -git \ -libboost-all-dev +lldb ENV CXX=/usr/bin/clang++ ENV CC=/usr/bin/clang diff --git a/docker/ci/Dockerfile-gcc b/docker/ci/Dockerfile-gcc index 7e3b786f1..992f710ab 100644 --- a/docker/ci/Dockerfile-gcc +++ b/docker/ci/Dockerfile-gcc @@ -2,8 +2,7 @@ ARG ENV_REPOSITORY=nanocurrency/nano-env FROM ${ENV_REPOSITORY}:base RUN apt-get update -qq && apt-get install -yqq \ -git \ -libboost-all-dev +.. ARG REPOSITORY=nanocurrency/nano-node LABEL org.opencontainers.image.source https://github.com/$REPOSITORY diff --git a/util/build_prep/bootstrap_boost.sh b/util/build_prep/bootstrap_boost.sh deleted file mode 100755 index 980a8be6f..000000000 --- a/util/build_prep/bootstrap_boost.sh +++ /dev/null @@ -1,150 +0,0 @@ -#!/usr/bin/env bash - -bootstrapArgs=() -buildArgs=() -useClang='false' -useLibCXX='false' -keepArchive='false' -LINK_TYPE=('link=static') -debugLevel=0 -buildThreads=1 -buildCArgs=() -buildCXXArgs=() -buildLDArgs=() -boostVersion='1.70' -while getopts 'hmscCkpvB:j:' OPT; do - case "${OPT}" in - h) - echo "Usage: bootstrap_boost.sh [-hmcCkpv] [-B ]" - echo " -h This help" - echo " -s Build Shared and static libs, default is static only" - echo " -m Build a minimal set of libraries needed for Nano" - echo " -j Number of threads to build with" - echo " -c Use Clang" - echo " -C Use libc++ when using Clang" - echo " -k Keep the downloaded archive file" - echo " -p Build a PIC version of the objects" - echo " -v Increase debug level, may be repeated to increase it" - echo " further" - echo " -B Specify version of Boost to build" - exit 0 - ;; - s) - LINK_TYPE+=('link=shared') - ;; - m) - bootstrapArgs+=('--with-libraries=system,thread,log,filesystem,program_options,coroutine,context') - ;; - j) - buildThreads=${OPTARG} - ;; - c) - useClang='true' - ;; - C) - useLibCXX='true' - ;; - k) - keepArchive='true' - ;; - p) - buildCXXArgs+=(-fPIC) - buildCArgs+=(-fPIC) - ;; - v) - debugLevel=$(($debugLevel + 1)) - ;; - B) - boostVersion="${OPTARG}" - ;; - esac -done - -set -o errexit -set -o xtrace - -if ! c++ --version >/dev/null 2>/dev/null; then - useClang='true' - - if ! clang++ --version >/dev/null 2>/dev/null; then - echo "Unable to find a usable toolset" >&2 - - exit 1 - fi -fi - -if [ "${useClang}" = 'true' ]; then - bootstrapArgs+=(--with-toolset=clang) - buildArgs+=(toolset=clang) - if [ "${useLibCXX}" = 'true' ]; then - buildCXXArgs+=(-stdlib=libc++) - buildLDArgs+=(-stdlib=libc++) - fi -fi - -case "${boostVersion}" in -1.70) - BOOST_BASENAME=boost_1_70_0 - 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' - ;; -1.75) - BOOST_BASENAME=boost_1_75_0 - BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.75.0/${BOOST_BASENAME}.tar.bz2/download - BOOST_ARCHIVE_SHA256='953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb' - ;; -*) - echo "Unsupported Boost version: ${boostVersion}" >&2 - exit 1 - ;; -esac -BOOST_ARCHIVE="${BOOST_BASENAME}.tar.bz2" -BOOST_ROOT=${BOOST_ROOT-/usr/local/boost} - -if [ ! -f "${BOOST_ARCHIVE}" ]; then - wget --quiet -O "${BOOST_ARCHIVE}.new" "${BOOST_URL}" - checkHash="$(openssl dgst -sha256 "${BOOST_ARCHIVE}.new" | sed 's@^.*= *@@')" - if [ "${checkHash}" != "${BOOST_ARCHIVE_SHA256}" ]; then - echo "Checksum mismatch. Expected ${BOOST_ARCHIVE_SHA256}, got ${checkHash}" >&2 - - exit 1 - fi - mv "${BOOST_ARCHIVE}.new" "${BOOST_ARCHIVE}" || exit 1 -else - keepArchive='true' -fi - -if [ -n "${buildCArgs[*]}" ]; then - buildArgs+=(cflags="${buildCArgs[*]}") -fi - -if [ -n "${buildCXXArgs[*]}" ]; then - buildArgs+=(cxxflags="${buildCXXArgs[*]}") -fi - -if [ -n "${buildLDArgs[*]}" ]; then - buildArgs+=(linkflags="${buildLDArgs[*]}") -fi - -rm -rf "${BOOST_BASENAME}" -tar xf "${BOOST_ARCHIVE}" - -pushd "${BOOST_BASENAME}" -./bootstrap.sh "${bootstrapArgs[@]}" -./b2 -d${debugLevel} -j${buildThreads} hardcode-dll-paths=true dll-path="'\$ORIGIN/../lib'" --prefix="${BOOST_ROOT}" ${LINK_TYPE[@]} "${buildArgs[@]}" install -popd - -rm -rf "${BOOST_BASENAME}" -if [ "${keepArchive}" != 'true' ]; then - rm -f "${BOOST_ARCHIVE}" -fi diff --git a/util/build_prep/fetch_boost.sh b/util/build_prep/fetch_boost.sh deleted file mode 100755 index aade08f43..000000000 --- a/util/build_prep/fetch_boost.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -OS=$(uname) - -COMPILER="${COMPILER:-clang}" - -pushd /tmp -if [[ "$OS" == 'Linux' ]]; then - wget -O boost-$OS-$COMPILER.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$COMPILER-1.70-18.tgz -else - wget -O boost-$OS-$COMPILER.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$COMPILER-1.70-full.tgz -fi -tar -zxf boost-$OS-$COMPILER.tgz -mv tmp/* . -rm -fr tmp -popd