From 165cab9e9d563af3c4ddb5209eb26048cc8ad347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Wed, 2 Dec 2020 00:05:10 +0100 Subject: [PATCH] Switch the external tests back to the usual branches from solidity-external-tests --- test/externalTests/colony.sh | 2 +- test/externalTests/ens.sh | 2 +- test/externalTests/gnosis-v2.sh | 4 ++-- test/externalTests/gnosis.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh index 87d96b463..6e29637cb 100755 --- a/test/externalTests/colony.sh +++ b/test/externalTests/colony.sh @@ -33,7 +33,7 @@ function colony_test OPTIMIZER_LEVEL=3 CONFIG="truffle.js" - truffle_setup "$SOLJSON" https://github.com/solidity-external-tests/colonyNetwork.git develop_070_new + truffle_setup "$SOLJSON" https://github.com/solidity-external-tests/colonyNetwork.git develop_070 run_install "$SOLJSON" install_fn cd lib diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh index 907411b6d..72337f62c 100755 --- a/test/externalTests/ens.sh +++ b/test/externalTests/ens.sh @@ -33,7 +33,7 @@ function ens_test export OPTIMIZER_LEVEL=1 export CONFIG="truffle-config.js" - truffle_setup "$SOLJSON" https://github.com/solidity-external-tests/ens.git upgrade-0.8.0 + truffle_setup "$SOLJSON" https://github.com/solidity-external-tests/ens.git master_070 # Use latest Truffle. Older versions crash on the output from 0.8.0. force_truffle_version ^5.1.55 diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh index 6f3563ca3..07b2e171a 100755 --- a/test/externalTests/gnosis-v2.sh +++ b/test/externalTests/gnosis-v2.sh @@ -35,8 +35,8 @@ function gnosis_safe_test truffle_setup "$SOLJSON" https://github.com/solidity-external-tests/safe-contracts.git v2_070 - sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_070_new|g' package.json - sed -i -E 's|"@gnosis.pm/util-contracts": "[^"]+"|"@gnosis.pm/util-contracts": "github:solidity-external-tests/util-contracts#solc-7"|g' package.json + sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_070|g' package.json + sed -i -E 's|"@gnosis.pm/util-contracts": "[^"]+"|"@gnosis.pm/util-contracts": "github:solidity-external-tests/util-contracts#solc-7_070"|g' package.json # Remove the lock file (if it exists) to prevent it from overriding our changes in package.json rm -f package-lock.json diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh index 7ea76c067..ca2f6844a 100755 --- a/test/externalTests/gnosis.sh +++ b/test/externalTests/gnosis.sh @@ -33,9 +33,9 @@ function gnosis_safe_test OPTIMIZER_LEVEL=1 CONFIG="truffle-config.js" - truffle_setup "$SOLJSON" https://github.com/solidity-external-tests/safe-contracts.git development_070_new + truffle_setup "$SOLJSON" https://github.com/solidity-external-tests/safe-contracts.git development_070 - sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_070_new|g' package.json + sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_070|g' package.json # Remove the lock file (if it exists) to prevent it from overriding our changes in package.json rm -f package-lock.json