Remove external boost references from CI build (#4127)

nanocurrency · Feb 14, 2023 · 92e0b64 · 92e0b64
1 parent dacd0be
commit 92e0b64
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 187 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/util/build_prep/fetch_boost.sh b/util/build_prep/fetch_boost.sh