Skip to content

Do not use fork of openzeppelin anymore #5106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chriseth merged 2 commits into from
Jan 22, 2019
Merged

Do not use fork of openzeppelin anymore #5106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a52de11
Do not use fork of openzeppelin anymore
axic Sep 27, 2018
028bc7d
Only replace solc-js copies in directories present during externalTests
axic Jan 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions test/externalTests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,13 @@ function test_truffle
for d in node_modules node_modules/truffle/node_modules
do
(
cd $d
rm -rf solc
git clone --depth 1 -b v0.5.0 https://github.com/ethereum/solc-js.git solc
cp "$SOLJSON" solc/
if [ -d "$d" ]
then
cd $d
rm -rf solc
git clone --depth 1 -b v0.5.0 https://github.com/ethereum/solc-js.git solc
cp "$SOLJSON" solc/
fi
)
done
if [ "$name" == "Zeppelin" -o "$name" == "Gnosis" ]; then
Expand All @@ -85,8 +88,8 @@ function test_truffle
rm -rf "$DIR"
}

# Using our temporary fork here. Hopefully to be merged into upstream after the 0.5.0 release.
test_truffle Zeppelin https://github.com/axic/openzeppelin-solidity.git solidity-050
# Since Zeppelin 2.1.1 it supports Solidity 0.5.0.
test_truffle Zeppelin https://github.com/OpenZeppelin/openzeppelin-solidity.git master

# Disabled temporarily as it needs to be updated to latest Truffle first.
#test_truffle Gnosis https://github.com/axic/pm-contracts.git solidity-050
Expand Down