cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5106 from ethereum/zeppelin

Browse Source 
Do not use fork of openzeppelin anymore
This commit is contained in:
chriseth 2019-01-22 18:33:45 +01:00 committed by GitHub
commit 7a17e7f326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/externalTests.sh
View File

@ -59,10 +59,13 @@ function test_truffle
for d in node_modules node_modules/truffle/node_modules for d in node_modules node_modules/truffle/node_modules
do do
( (
if [ -d "$d" ]
then
cd $d cd $d
rm -rf solc rm -rf solc
git clone --depth 1 -b v0.5.0 https://github.com/ethereum/solc-js.git solc git clone --depth 1 -b v0.5.0 https://github.com/ethereum/solc-js.git solc
cp "$SOLJSON" solc/ cp "$SOLJSON" solc/
fi
) )
done done
if [ "$name" == "Zeppelin" -o "$name" == "Gnosis" ]; then if [ "$name" == "Zeppelin" -o "$name" == "Gnosis" ]; then
@ -85,8 +88,8 @@ function test_truffle
rm -rf "$DIR" rm -rf "$DIR"
} }
# Using our temporary fork here. Hopefully to be merged into upstream after the 0.5.0 release. # Since Zeppelin 2.1.1 it supports Solidity 0.5.0.
test_truffle Zeppelin https://github.com/axic/openzeppelin-solidity.git solidity-050 test_truffle Zeppelin https://github.com/OpenZeppelin/openzeppelin-solidity.git master
# Disabled temporarily as it needs to be updated to latest Truffle first. # Disabled temporarily as it needs to be updated to latest Truffle first.
#test_truffle Gnosis https://github.com/axic/pm-contracts.git solidity-050 #test_truffle Gnosis https://github.com/axic/pm-contracts.git solidity-050