build: remove boost dependency and internal sortition package (#5459)

algorand · Jun 8, 2023 · 78b0a81 · 78b0a81
1 parent 3fbc4b6
commit 78b0a81
Show file tree

Hide file tree

Showing 19 changed files with 13 additions and 250 deletions.
diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml
@@ -13,8 +13,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0 # required for new-from-rev option in .golangci.yml
-      - name: Install libraries
-        run: sudo apt-get -y -q install libboost-math-dev
         # move go out of the way temporarily to avoid "go list ./..." from installing modules
       - name: Make libsodium.a
         run: sudo mv /usr/bin/go /usr/bin/go.bak && make crypto/libs/linux/amd64/lib/libsodium.a && sudo mv /usr/bin/go.bak /usr/bin/go
@@ -37,8 +35,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0 # required for new-from-rev option in .golangci.yml
-      - name: Install libraries
-        run: sudo apt-get -y -q install libboost-math-dev
       # move go out of the way temporarily to avoid "go list ./..." from installing modules
       - name: Make libsodium.a
         run: sudo mv /usr/bin/go /usr/bin/go.bak && make crypto/libs/linux/amd64/lib/libsodium.a && sudo mv /usr/bin/go.bak /usr/bin/go

diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
@@ -20,8 +20,6 @@ jobs:
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
-      - name: Install libraries
-        run: sudo apt-get -y -q install libboost-math-dev
       # move go out of the way temporarily to avoid "go list ./..." from installing modules
       - name: Make libsodium.a
         run: sudo mv /usr/bin/go /usr/bin/go.bak && make crypto/libs/linux/amd64/lib/libsodium.a && sudo mv /usr/bin/go.bak /usr/bin/go

diff --git a/data/committee/sortition/sortition.cpp b/data/committee/sortition/sortition.cpp
diff --git a/data/committee/sortition/sortition.go b/data/committee/sortition/sortition.go
diff --git a/data/committee/sortition/sortition.h b/data/committee/sortition/sortition.h
diff --git a/data/committee/sortition/sortition_test.go b/data/committee/sortition/sortition_test.go
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:18.04
 ARG GOLANG_VERSION
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt update && apt-get install -y git libboost-all-dev wget sqlite3 autoconf sudo tzdata bsdmainutils
+RUN apt update && apt-get install -y git wget sqlite3 autoconf sudo tzdata bsdmainutils
 
 WORKDIR /root
 RUN wget --quiet https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz && tar -xvf go${GOLANG_VERSION}.linux-amd64.tar.gz && mv go /usr/local

diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:16.04
 ARG GOLANG_VERSION
 
-RUN apt-get update && apt-get install -y git libboost-all-dev wget sqlite3 autoconf build-essential shellcheck
+RUN apt-get update && apt-get install -y git wget sqlite3 autoconf build-essential shellcheck
 WORKDIR /root
 RUN wget --quiet https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz && tar -xvf go${GOLANG_VERSION}.linux-amd64.tar.gz && mv go /usr/local
 ENV GOROOT=/usr/local/go \

diff --git a/docker/build/Dockerfile-deploy b/docker/build/Dockerfile-deploy
@@ -1,7 +1,7 @@
 FROM --platform=linux/amd64 ubuntu:18.04
 ARG GOLANG_VERSION
 
-RUN apt-get update && apt-get install -y git libboost-all-dev wget sqlite3 autoconf jq bsdmainutils shellcheck
+RUN apt-get update && apt-get install -y git wget sqlite3 autoconf jq bsdmainutils shellcheck
 WORKDIR /root
 RUN wget --quiet https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz && tar -xvf go${GOLANG_VERSION}.linux-amd64.tar.gz && mv go /usr/local
 ENV GOROOT=/usr/local/go \

diff --git a/docker/build/cicd.alpine.Dockerfile b/docker/build/cicd.alpine.Dockerfile
@@ -5,7 +5,6 @@ RUN apk update && \
     apk add bash && \
     apk add git && \
     apk add python3 && \
-    apk add boost-dev && \
     apk add expect && \
     apk add jq && \
     apk add autoconf && \

diff --git a/docker/build/cicd.centos.Dockerfile b/docker/build/cicd.centos.Dockerfile
@@ -5,7 +5,7 @@ ARG GOLANG_VERSION
 ARG ARCH="amd64"
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
     yum update -y && \
-    yum install -y autoconf wget awscli git gnupg2 nfs-utils python3-devel sqlite3 boost-devel expect jq \
+    yum install -y autoconf wget awscli git gnupg2 nfs-utils python3-devel sqlite3 expect jq \
     libtool gcc-c++ libstdc++-devel libstdc++-static rpmdevtools createrepo rpm-sign bzip2 which ShellCheck \
     libffi-devel openssl-devel
 WORKDIR /root

diff --git a/docker/build/cicd.centos8.Dockerfile b/docker/build/cicd.centos8.Dockerfile
@@ -5,7 +5,7 @@ ARG GOLANG_VERSION
 ARG ARCH="amd64"
 RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
     dnf update -y && \
-    dnf install -y autoconf wget awscli git gnupg2 nfs-utils python3-devel boost-devel expect jq \
+    dnf install -y autoconf wget awscli git gnupg2 nfs-utils python3-devel expect jq \
     libtool gcc-c++ libstdc++-devel rpmdevtools createrepo rpm-sign bzip2 which \
     libffi-devel openssl-devel
 RUN dnf install -y epel-release && \

diff --git a/docker/build/cicd.ubuntu.Dockerfile b/docker/build/cicd.ubuntu.Dockerfile
@@ -5,7 +5,7 @@ ARG GOLANG_VERSION
 ARG ARCH="amd64"
 ARG GOARCH="amd64"
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get install -y build-essential git libboost-all-dev wget sqlite3 autoconf jq bsdmainutils shellcheck awscli
+RUN apt-get update && apt-get install -y build-essential git wget sqlite3 autoconf jq bsdmainutils shellcheck awscli
 WORKDIR /root
 RUN wget https://dl.google.com/go/go${GOLANG_VERSION}.linux-${GOARCH}.tar.gz \
     && tar -xvf go${GOLANG_VERSION}.linux-${GOARCH}.tar.gz && \

diff --git a/docker/build/docker.ubuntu.Dockerfile b/docker/build/docker.ubuntu.Dockerfile
@@ -14,7 +14,7 @@ RUN update-alternatives --install /usr/bin/python python /usr/bin/python2.7 1 &&
     update-alternatives --set python /usr/bin/python3.7 && \
     pip3 install mulecli
 
-RUN apt-get update && apt-get install -y autoconf bsdmainutils git libboost-all-dev && \
+RUN apt-get update && apt-get install -y autoconf bsdmainutils git && \
     curl https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz | tar -xzf - && \
     mv go /usr/local
 

diff --git a/scripts/configure_dev.sh b/scripts/configure_dev.sh
@@ -77,7 +77,6 @@ elif [ "${OS}" = "darwin" ]; then
         brew tap homebrew/cask
     fi
     install_or_upgrade pkg-config
-    install_or_upgrade boost
     install_or_upgrade libtool
     install_or_upgrade shellcheck
     if [ "${CIRCLECI}" != "true" ]; then
@@ -90,7 +89,7 @@ elif [ "${OS}" = "darwin" ]; then
         lnav -i "$SCRIPTPATH/algorand_node_log.json"
     fi
 elif [ "${OS}" = "windows" ]; then
-    if ! $msys2 pacman -S --disable-download-timeout --noconfirm git automake autoconf m4 libtool make mingw-w64-x86_64-gcc mingw-w64-x86_64-boost mingw-w64-x86_64-python mingw-w64-x86_64-jq unzip procps; then
+    if ! $msys2 pacman -S --disable-download-timeout --noconfirm git automake autoconf m4 libtool make mingw-w64-x86_64-gcc mingw-w64-x86_64-python mingw-w64-x86_64-jq unzip procps; then
         echo "Error installing pacman dependencies"
         exit 1
     fi

diff --git a/scripts/install_linux_deps.sh b/scripts/install_linux_deps.sh
@@ -4,9 +4,9 @@ set -e
 . /etc/os-release
 DISTRIB=$ID
 
-ARCH_DEPS="boost boost-libs expect jq autoconf shellcheck sqlite python-virtualenv"
-UBUNTU_DEPS="libtool libboost-math-dev expect jq autoconf shellcheck sqlite3 python3-venv build-essential"
-FEDORA_DEPS="boost-devel expect jq autoconf ShellCheck sqlite python-virtualenv"
+ARCH_DEPS="expect jq autoconf shellcheck sqlite python-virtualenv"
+UBUNTU_DEPS="libtool expect jq autoconf shellcheck sqlite3 python3-venv build-essential"
+FEDORA_DEPS="expect jq autoconf ShellCheck sqlite python-virtualenv"
 
 case $DISTRIB in 
     "arch" | "manjaro")

diff --git a/scripts/release/common/docker/centos.Dockerfile b/scripts/release/common/docker/centos.Dockerfile
@@ -2,7 +2,7 @@ FROM centos:7
 
 WORKDIR /root
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-RUN yum install -y autoconf awscli curl git gnupg2 nfs-utils python36 sqlite3 boost-devel expect jq libtool gcc-c++ libstdc++-devel libstdc++-static rpmdevtools createrepo rpm-sign bzip2 which ShellCheck
+RUN yum install -y autoconf awscli curl git gnupg2 nfs-utils python36 sqlite3 expect jq libtool gcc-c++ libstdc++-devel libstdc++-static rpmdevtools createrepo rpm-sign bzip2 which ShellCheck
 
 ENTRYPOINT ["/bin/bash"]
 
diff --git a/scripts/release/common/docker/centos8.Dockerfile b/scripts/release/common/docker/centos8.Dockerfile
@@ -2,7 +2,7 @@ FROM quay.io/centos/centos:stream8
 
 WORKDIR /root
 RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
-    dnf install -y autoconf awscli curl git gnupg2 nfs-utils python36 sqlite boost-devel expect jq libtool gcc-c++ libstdc++-devel rpmdevtools createrepo rpm-sign bzip2 which && \
+    dnf install -y autoconf awscli curl git gnupg2 nfs-utils python36 sqlite expect jq libtool gcc-c++ libstdc++-devel rpmdevtools createrepo rpm-sign bzip2 which && \
     dnf -y --enablerepo=powertools install libstdc++-static
 
 RUN echo "${BOLD}Downloading and installing binaries...${RESET}" && \

diff --git a/scripts/travis/configure_dev.sh b/scripts/travis/configure_dev.sh
@@ -18,14 +18,6 @@ if [[ "${OS}" == "linux" ]]; then
         sudo apt-get update -y
         sudo apt-get -y install sqlite3
     fi
-elif [[ "${OS}" == "darwin" ]]; then
-    # we don't want to upgrade boost if we already have it, as it will try to update
-    # other components.
-    if [ "${CIRCLECI}" != "true" ]; then
-        brew update
-        brew tap homebrew/cask
-        brew pin boost || true
-    fi
 elif [[ "${OS}" == "windows" ]]; then
     git config --global core.autocrlf true
     # Golang probably is not installed under MSYS2 so add the environment variable temporarily