mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #4073 from alibabe/fix-jsoncpp-install
Install a different jsoncpp version on cirleci to ensure compilation never clashes with the internal one
This commit is contained in:
commit
7778eaf03a
@ -129,6 +129,7 @@ jobs:
|
|||||||
command: |
|
command: |
|
||||||
apt-get -qq update
|
apt-get -qq update
|
||||||
apt-get -qy install cmake libboost-regex-dev libboost-filesystem-dev libboost-test-dev libboost-system-dev libboost-program-options-dev libz3-dev
|
apt-get -qy install cmake libboost-regex-dev libboost-filesystem-dev libboost-test-dev libboost-system-dev libboost-program-options-dev libz3-dev
|
||||||
|
./scripts/install_obsolete_jsoncpp_1_7_4.sh
|
||||||
- run: *setup_prerelease_commit_hash
|
- run: *setup_prerelease_commit_hash
|
||||||
- run: *run_build
|
- run: *run_build
|
||||||
- store_artifacts: *solc_artifact
|
- store_artifacts: *solc_artifact
|
||||||
@ -150,6 +151,8 @@ jobs:
|
|||||||
brew install z3
|
brew install z3
|
||||||
brew install boost
|
brew install boost
|
||||||
brew install cmake
|
brew install cmake
|
||||||
|
brew install wget
|
||||||
|
./scripts/install_obsolete_jsoncpp_1_7_4.sh
|
||||||
- run: *setup_prerelease_commit_hash
|
- run: *setup_prerelease_commit_hash
|
||||||
- run: *run_build
|
- run: *run_build
|
||||||
- store_artifacts: *solc_artifact
|
- store_artifacts: *solc_artifact
|
||||||
|
16
scripts/install_obsolete_jsoncpp_1_7_4.sh
Executable file
16
scripts/install_obsolete_jsoncpp_1_7_4.sh
Executable file
@ -0,0 +1,16 @@
|
|||||||
|
#!/usr/bin/env sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
TEMPDIR=$(mktemp -d)
|
||||||
|
(
|
||||||
|
cd $TEMPDIR
|
||||||
|
wget https://github.com/open-source-parsers/jsoncpp/archive/1.7.4.tar.gz
|
||||||
|
tar xvzf "1.7.4.tar.gz"
|
||||||
|
cd "jsoncpp-1.7.4"
|
||||||
|
mkdir -p build
|
||||||
|
cd build
|
||||||
|
cmake -DARCHIVE_INSTALL_DIR=. -G "Unix Makefiles" ..
|
||||||
|
make
|
||||||
|
make install
|
||||||
|
)
|
||||||
|
rm -rf $TEMPDIR
|
Loading…
Reference in New Issue
Block a user