Merge pull request #3658 from ethereum/newcppEthimage

Use new eth binary for trusty.
This commit is contained in:
Alex Beregszaszi 2018-03-06 15:26:06 +01:00 committed by GitHub
commit 0df4c64884
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -59,12 +59,15 @@ function download_eth()
ETH_PATH="eth" ETH_PATH="eth"
else else
mkdir -p /tmp/test mkdir -p /tmp/test
ETH_BINARY=eth_byzantium_artful
ETH_HASH="e527dd3e3dc17b983529dd7dcfb74a0d3a5aed4e"
if grep -i trusty /etc/lsb-release >/dev/null 2>&1 if grep -i trusty /etc/lsb-release >/dev/null 2>&1
then then
ETH_BINARY=eth_byzantium2 # built from 1ecff3cac12f0fbbeea3e645f331d5ac026b24d3 at 2018-03-06
ETH_HASH="4dc3f208475f622be7c8e53bee720e14cd254c6f" ETH_BINARY=eth_byzantium_trusty
ETH_HASH="5432ea81c150e8a3547615bf597cd6dce9e1e27b"
else
# built from ?? at 2018-02-13 ?
ETH_BINARY=eth_byzantium_artful
ETH_HASH="e527dd3e3dc17b983529dd7dcfb74a0d3a5aed4e"
fi fi
wget -q -O /tmp/test/eth https://github.com/ethereum/cpp-ethereum/releases/download/solidityTester/$ETH_BINARY wget -q -O /tmp/test/eth https://github.com/ethereum/cpp-ethereum/releases/download/solidityTester/$ETH_BINARY
test "$(shasum /tmp/test/eth)" = "$ETH_HASH /tmp/test/eth" test "$(shasum /tmp/test/eth)" = "$ETH_HASH /tmp/test/eth"
@ -121,4 +124,4 @@ wait $CMDLINE_PID
pkill "$ETH_PID" || true pkill "$ETH_PID" || true
sleep 4 sleep 4
pgrep "$ETH_PID" && pkill -9 "$ETH_PID" || true pgrep "$ETH_PID" && pkill -9 "$ETH_PID" || true