From 98734ae9c9d4965352ce1869263b8428f0430982 Mon Sep 17 00:00:00 2001 From: meows Date: Tue, 21 Sep 2021 08:35:47 -0700 Subject: [PATCH 1/2] build: don't download already-existing evmc sources for testing Date: 2021-09-21 08:35:47-07:00 Signed-off-by: meows --- build/aleth-interpreter.sh | 1 + build/evmone.sh | 1 + build/ssvm.sh | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/aleth-interpreter.sh b/build/aleth-interpreter.sh index 1a61d155d101c..42942cabac008 100755 --- a/build/aleth-interpreter.sh +++ b/build/aleth-interpreter.sh @@ -9,5 +9,6 @@ if [[ "$OSTYPE" != "linux"* ]]; then fi mkdir -p build/_workspace/aleth +[[ -f build/_workspace/aleth/aleth-1.8.0-linux-x86_64.tar.gz ]] && exit 0 wget -O build/_workspace/aleth/aleth-1.8.0-linux-x86_64.tar.gz https://github.com/ethereum/aleth/releases/download/v1.8.0/aleth-1.8.0-linux-x86_64.tar.gz tar xzvf build/_workspace/aleth/aleth-1.8.0-linux-x86_64.tar.gz -C build/_workspace/aleth/ diff --git a/build/evmone.sh b/build/evmone.sh index 0aea9cddc40c3..36c379d13dca7 100755 --- a/build/evmone.sh +++ b/build/evmone.sh @@ -8,5 +8,6 @@ if [[ "$OSTYPE" != "linux"* ]]; then fi mkdir -p build/_workspace/evmone +[[ -f build/_workspace/evmone/evmone-0.5.0-linux-x86_64.tar.gz ]] && exit 0 wget -O build/_workspace/evmone/evmone-0.5.0-linux-x86_64.tar.gz https://github.com/ethereum/evmone/releases/download/v0.5.0/evmone-0.5.0-linux-x86_64.tar.gz tar xzvf build/_workspace/evmone/evmone-0.5.0-linux-x86_64.tar.gz -C build/_workspace/evmone/ diff --git a/build/ssvm.sh b/build/ssvm.sh index 949f2cc1cdb44..7e86117032a87 100755 --- a/build/ssvm.sh +++ b/build/ssvm.sh @@ -8,5 +8,5 @@ if [[ "$OSTYPE" != "linux"* ]]; then fi mkdir -p build/_workspace/SSVM/build/tools/ssvm-evmc/ -wget -O build/_workspace/SSVM/build/tools/ssvm-evmc/libssvmEVMC.so \ +[[ -f build/_workspace/SSVM/build/tools/ssvm-evmc/libssvmEVMC.so ]] || wget -O build/_workspace/SSVM/build/tools/ssvm-evmc/libssvmEVMC.so \ https://github.com/second-state/ssvm-evmc/releases/download/evmc7-0.1.1/libssvm-evmc.so From 1db8fb9917978610656f17005e15367992143dc2 Mon Sep 17 00:00:00 2001 From: meowsbits Date: Tue, 21 Sep 2021 14:19:14 -0700 Subject: [PATCH 2/2] build: (logic preference) exit instead of OR condition Co-authored-by: Chris Ziogas --- build/ssvm.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/ssvm.sh b/build/ssvm.sh index 7e86117032a87..c6d33c70f17a9 100755 --- a/build/ssvm.sh +++ b/build/ssvm.sh @@ -8,5 +8,6 @@ if [[ "$OSTYPE" != "linux"* ]]; then fi mkdir -p build/_workspace/SSVM/build/tools/ssvm-evmc/ -[[ -f build/_workspace/SSVM/build/tools/ssvm-evmc/libssvmEVMC.so ]] || wget -O build/_workspace/SSVM/build/tools/ssvm-evmc/libssvmEVMC.so \ +[[ -f build/_workspace/SSVM/build/tools/ssvm-evmc/libssvmEVMC.so ]] && exit 0 +wget -O build/_workspace/SSVM/build/tools/ssvm-evmc/libssvmEVMC.so \ https://github.com/second-state/ssvm-evmc/releases/download/evmc7-0.1.1/libssvm-evmc.so