diff options
| -rw-r--r-- | scripts/cpp-ethereum/eth_trusty.docker | 12 | ||||
| -rwxr-xr-x | scripts/tests.sh | 12 |
2 files changed, 15 insertions, 9 deletions
diff --git a/scripts/cpp-ethereum/eth_trusty.docker b/scripts/cpp-ethereum/eth_trusty.docker index 0c4d7a02..5cfb59f7 100644 --- a/scripts/cpp-ethereum/eth_trusty.docker +++ b/scripts/cpp-ethereum/eth_trusty.docker @@ -1,7 +1,13 @@ FROM ubuntu:trusty -RUN apt update -RUN apt -y install libleveldb-dev cmake g++ git +RUN apt-get update +RUN apt-get -y install software-properties-common python-software-properties +RUN add-apt-repository ppa:ubuntu-toolchain-r/test +RUN apt-get update +RUN apt-get -y install gcc libleveldb-dev git curl make gcc-7 g++-7 +RUN ln -sf /usr/bin/gcc-7 /usr/bin/gcc +RUN ln -sf /usr/bin/g++-7 /usr/bin/g++ RUN git clone --recursive https://github.com/ethereum/cpp-ethereum --branch develop --single-branch --depth 1 -RUN mkdir /build && cd /build && cmake /cpp-ethereum -DCMAKE_BUILD_TYPE=RelWithDebInfo -DTOOLS=Off -DTESTS=Off +RUN ./cpp-ethereum/scripts/install_cmake.sh +RUN mkdir /build && cd /build && ~/.local/bin/cmake /cpp-ethereum -DCMAKE_BUILD_TYPE=RelWithDebInfo -DTOOLS=Off -DTESTS=Off RUN cd /build && make eth diff --git a/scripts/tests.sh b/scripts/tests.sh index 37ffafc2..2e40f8cb 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -61,13 +61,13 @@ function download_eth() mkdir -p /tmp/test if grep -i trusty /etc/lsb-release >/dev/null 2>&1 then - # built from 1ecff3cac12f0fbbeea3e645f331d5ac026b24d3 at 2018-03-06 - ETH_BINARY=eth_byzantium_trusty - ETH_HASH="5432ea81c150e8a3547615bf597cd6dce9e1e27b" + # built from 5ac09111bd0b6518365fe956e1bdb97a2db82af1 at 2018-04-05 + ETH_BINARY=eth_2018-04-05_trusty + ETH_HASH="1e5e178b005e5b51f9d347df4452875ba9b53cc6" else - # built from ?? at 2018-02-13 ? - ETH_BINARY=eth_byzantium_artful - ETH_HASH="e527dd3e3dc17b983529dd7dcfb74a0d3a5aed4e" + # built from 5ac09111bd0b6518365fe956e1bdb97a2db82af1 at 2018-04-05 + ETH_BINARY=eth_2018-04-05_artful + ETH_HASH="eb2d0df022753bb2b442ba73e565a9babf6828d6" fi 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" |