aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2018-06-12 02:57:56 +0800
committerGitHub <noreply@github.com>2018-06-12 02:57:56 +0800
commitd035561992ab962d9a467b323aff4c006c74a3f1 (patch)
tree50b9bb19193f180ef9b4f4c880b855a0b38b0987
parent81c5a6e466fd360c0a4805396137fc45f7b309c8 (diff)
parent396b1883525d5dcfd8cb3b09a3d3b50fde4c3dca (diff)
downloaddexon-solidity-d035561992ab962d9a467b323aff4c006c74a3f1.tar.gz
dexon-solidity-d035561992ab962d9a467b323aff4c006c74a3f1.tar.zst
dexon-solidity-d035561992ab962d9a467b323aff4c006c74a3f1.zip
Merge pull request #4206 from ethereum/050-testing
Use temporary fork of Gnosis/Zeppelin contracts
-rwxr-xr-xtest/externalTests.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/externalTests.sh b/test/externalTests.sh
index cd6deb75..1565d04f 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -56,5 +56,6 @@ function test_truffle
rm -rf "$DIR"
}
-test_truffle Gnosis https://github.com/gnosis/gnosis-contracts.git
-test_truffle Zeppelin https://github.com/OpenZeppelin/zeppelin-solidity.git
+# Using our temporary fork here. Hopefully to be merged into upstream after the 0.5.0 release.
+test_truffle Gnosis https://github.com/axic/pm-contracts.git -b solidity-050
+test_truffle Zeppelin https://github.com/axic/openzeppelin-solidity.git -b solidity-050