From a52de117ea58f97b799321fb7ea7be7cc1294873 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 27 Sep 2018 02:00:36 +0100 Subject: [PATCH 1/2] Do not use fork of openzeppelin anymore --- test/externalTests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/externalTests.sh b/test/externalTests.sh index 126b13b5dfe1..0f01ed26890d 100755 --- a/test/externalTests.sh +++ b/test/externalTests.sh @@ -85,8 +85,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 From 028bc7d20aece93decad4989bc42a14e3671aeb2 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Tue, 22 Jan 2019 16:45:49 +0000 Subject: [PATCH 2/2] Only replace solc-js copies in directories present during externalTests --- test/externalTests.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/externalTests.sh b/test/externalTests.sh index 0f01ed26890d..f87777e3e520 100755 --- a/test/externalTests.sh +++ b/test/externalTests.sh @@ -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