Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Commit

Permalink
Merge pull request #7871 from EOSIO/cicd-mac-boost-master
Browse files Browse the repository at this point in the history
[master] Mac Builder Boost Fix
  • Loading branch information
arhag authored Sep 9, 2019
2 parents 2deba91 + 170cd11 commit 9475b43
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .cicd/generate-pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ cat <<EOF
agents:
queue: "automation-basic-builder-fleet"
timeout: "${TIMEOUT:-5}"
skip: ${SKIP_MOJAVE}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
skip: ${SKIP_PACKAGE_BUILDER}${SKIP_MAC}${SKIP_MACOS_10_14}
EOF
IFS=$oIFS
15 changes: 13 additions & 2 deletions .cicd/platforms/macos-10.14.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
set -eo pipefail
VERSION=1
brew update
brew install git [email protected] cmake python@2 python libtool libusb graphviz automake wget gmp llvm@4 pkgconfig doxygen openssl || true
# install clang from source
brew install git cmake python@2 python libtool libusb graphviz automake wget gmp llvm@4 pkgconfig doxygen openssl || true
if [[ ! $PINNED == false || $UNPINNED == true ]]; then
# install clang from source
git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8
cd clang8
git checkout 18e41dc
Expand Down Expand Up @@ -49,6 +49,17 @@ if [[ ! $PINNED == false || $UNPINNED == true ]]; then
sudo make install
cd ../..
rm -rf clang8
# install boost from source
curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2
tar -xjf boost_1_70_0.tar.bz2
cd boost_1_70_0
./bootstrap.sh --prefix=/usr/local
sudo ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
cd ..
sudo rm -rf boost_1_70_0.tar.bz2 boost_1_70_0
else
# install boost from brew
brew install boost || true
fi
# install mongoDB
cd ~
Expand Down

0 comments on commit 9475b43

Please sign in to comment.