Skip to content

Commit 47232a0

Browse files
huangminghuanghuangminghuang
committed
update boost tarball location
1 parent 04dcbb0 commit 47232a0

17 files changed

Lines changed: 38 additions & 24 deletions

‎.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN git clone --depth 1 --single-branch --branch llvmorg-10.0.0 https://github.c
3535
cd / && \
3636
rm -rf /llvm
3737
# build boost
38-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
38+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
3939
tar -xjf boost_1_72_0.tar.bz2 && \
4040
cd boost_1_72_0 && \
4141
./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \

‎.cicd/platforms/pinned/centos-7.7-pinned.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ RUN git clone --depth 1 --single-branch --branch llvmorg-10.0.0 https://github.c
4141
cd / && \
4242
rm -rf /llvm
4343
# build boost
44-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
44+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
4545
tar -xjf boost_1_72_0.tar.bz2 && \
4646
cd boost_1_72_0 && \
4747
./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \

‎.cicd/platforms/pinned/centos-8-pinned.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN git clone --depth 1 --single-branch --branch llvmorg-10.0.0 https://github.c
3838
cd / && \
3939
rm -rf /llvm
4040
# build boost
41-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
41+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
4242
tar -xjf boost_1_72_0.tar.bz2 && \
4343
cd boost_1_72_0 && \
4444
./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \

‎.cicd/platforms/pinned/macos-10.14-pinned.sh‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ set -eo pipefail
33
VERSION=1
44
brew update
55
brew install git cmake python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl@1.1 jq libpq postgres || :
6-
# libpqxx 7.3+ installations on mojave try to import libs not present in the sdk. pin to libpqxx 7.2.1 instead.
7-
curl -LO https://raw.githubusercontent.com/Homebrew/homebrew-core/d14398187084e1d3fd1763ec13cea1044946a51f/Formula/libpqxx.rb
8-
brew install -f ./libpqxx.rb
96
# install clang from source
107
git clone --single-branch --branch llvmorg-10.0.0 https://github.com/llvm/llvm-project clang10
118
mkdir clang10/build
@@ -18,13 +15,21 @@ rm -rf clang10
1815
# install boost from source
1916
## Boost Fix: eosio/install/bin/../include/c++/v1/stdlib.h:94:15: fatal error: 'stdlib.h' file not found
2017
export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
21-
curl -LO https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2
18+
curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2
2219
tar -xjf boost_1_72_0.tar.bz2
2320
cd boost_1_72_0
2421
./bootstrap.sh --prefix=/usr/local
2522
sudo SDKROOT="$SDKROOT" ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
2623
cd ..
2724
sudo rm -rf boost_1_72_0.tar.bz2 boost_1_72_0
25+
26+
# install libpqxx from source
27+
curl -L https://github.com/jtv/libpqxx/archive/7.2.1.tar.gz | tar zxvf -
28+
cd libpqxx-7.2.1
29+
cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DPostgreSQL_ROOT=/usr/local/opt/libpq -DSKIP_BUILD_TEST=ON -DCMAKE_BUILD_TYPE=Release -S . -B build
30+
cmake --build build && cmake --install build
31+
cd .. && rm -rf libpqxx-7.2.1
32+
2833
# install nvm for ship_test
2934
cd ~ && brew install nvm && mkdir -p ~/.nvm && echo "export NVM_DIR=$HOME/.nvm" >> ~/.bash_profile && echo 'source $(brew --prefix nvm)/nvm.sh' >> ~/.bash_profile && cat ~/.bash_profile && source ~/.bash_profile && echo $NVM_DIR && nvm install --lts=dubnium
3035
# initialize postgres configuration files

‎.cicd/platforms/pinned/macos-10.15-pinned.sh‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ VERSION=1
44
export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
55
brew update
66
brew install git cmake python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq postgres || :
7-
curl -LO https://raw.githubusercontent.com/Homebrew/homebrew-core/106b4b8a421dda33c79a4018c3c3816234076331/Formula/libpqxx.rb
8-
brew install -f ./libpqxx.rb
97
# install clang from source
108
git clone --single-branch --branch llvmorg-10.0.0 https://github.com/llvm/llvm-project clang10
119
mkdir clang10/build
@@ -16,13 +14,21 @@ sudo make install
1614
cd ../..
1715
rm -rf clang10
1816
# install boost from source
19-
curl -LO https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2
17+
curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2
2018
tar -xjf boost_1_72_0.tar.bz2
2119
cd boost_1_72_0
2220
./bootstrap.sh --prefix=/usr/local
2321
sudo -E ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
2422
cd ..
2523
sudo rm -rf boost_1_72_0.tar.bz2 boost_1_72_0
24+
25+
# install libpqxx from source
26+
curl -L https://github.com/jtv/libpqxx/archive/7.2.1.tar.gz | tar zxvf -
27+
cd libpqxx-7.2.1
28+
cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DPostgreSQL_ROOT=/usr/local/opt/libpq -DSKIP_BUILD_TEST=ON -DCMAKE_BUILD_TYPE=Release -S . -B build
29+
cmake --build build && cmake --install build
30+
cd .. && rm -rf libpqxx-7.2.1
31+
2632
# install nvm for ship_test
2733
cd ~ && brew install nvm && mkdir -p ~/.nvm && echo "export NVM_DIR=$HOME/.nvm" >> ~/.bash_profile && echo 'source $(brew --prefix nvm)/nvm.sh' >> ~/.bash_profile && cat ~/.bash_profile && source ~/.bash_profile && echo $NVM_DIR && nvm install --lts=dubnium
2834
# initialize postgres configuration files

‎.cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN git clone --depth 1 --single-branch --branch llvmorg-10.0.0 https://github.c
3535
cd / && \
3636
rm -rf /llvm
3737
# build boost
38-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
38+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
3939
tar -xjf boost_1_72_0.tar.bz2 && \
4040
cd boost_1_72_0 && \
4141
./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \

‎.cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN git clone --depth 1 --single-branch --branch llvmorg-10.0.0 https://github.c
4040
cd / && \
4141
rm -rf /llvm
4242
# build boost
43-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
43+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
4444
tar -xjf boost_1_72_0.tar.bz2 && \
4545
cd boost_1_72_0 && \
4646
./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \

‎.cicd/platforms/pinned/ubuntu-20.04-pinned.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ RUN curl -L https://github.com/jtv/libpqxx/archive/7.2.1.tar.gz | tar zxvf - &&
5454
cmake --build build && cmake --install build && \
5555
cd .. && rm -rf libpqxx-7.2.1
5656
# build boost
57-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
57+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
5858
tar -xjf boost_1_72_0.tar.bz2 && \
5959
cd boost_1_72_0 && \
6060
./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \

‎.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN curl -LO https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.
1515
make install && \
1616
rm -rf cmake-3.16.2.tar.gz cmake-3.16.2
1717
# build boost
18-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
18+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
1919
tar -xjf boost_1_71_0.tar.bz2 && \
2020
cd boost_1_71_0 && \
2121
./bootstrap.sh --prefix=/usr/local && \

‎.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN curl -LO https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.
2121
make install && \
2222
rm -rf cmake-3.16.2.tar.gz cmake-3.16.2
2323
# build boost
24-
RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
24+
RUN curl -LO https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
2525
source /opt/rh/devtoolset-8/enable && \
2626
source /opt/rh/rh-python36/enable && \
2727
tar -xjf boost_1_71_0.tar.bz2 && \

0 commit comments

Comments
 (0)