From 46844d433defeeeaccfc6a833f07ae171b1e84f6 Mon Sep 17 00:00:00 2001 From: Alexander Arlt Date: Wed, 18 Nov 2020 16:15:22 -0500 Subject: [PATCH] buildpack-deps: Update hera to 0.3.2. --- .circleci/osx_install_dependencies.sh | 6 +++--- .../buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz | 4 ++-- scripts/docker/buildpack-deps/Dockerfile.ubuntu1804 | 10 +++++----- scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 | 4 ++-- .../docker/buildpack-deps/Dockerfile.ubuntu2004.clang | 4 ++-- test/Common.h | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh index 4041685b4..9050b05a0 100755 --- a/.circleci/osx_install_dependencies.sh +++ b/.circleci/osx_install_dependencies.sh @@ -57,7 +57,7 @@ then rm -f evmone-0.4.0-darwin-x86_64.tar.gz # hera - wget https://github.com/ewasm/hera/releases/download/v0.3.0/hera-0.3.0-darwin-x86_64.tar.gz - tar xzpf hera-0.3.0-darwin-x86_64.tar.gz -C /usr/local - rm -f hera-0.3.0-darwin-x86_64.tar.gz + wget https://github.com/ewasm/hera/releases/download/v0.3.2/hera-0.3.2-darwin-x86_64.tar.gz + tar xzpf hera-0.3.2-darwin-x86_64.tar.gz -C /usr/local + rm -f hera-0.3.2-darwin-x86_64.tar.gz fi diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz index 7cdf26cb1..787b33c03 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz +++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz @@ -22,7 +22,7 @@ # (c) 2016-2019 solidity contributors. #------------------------------------------------------------------------------ FROM gcr.io/oss-fuzz-base/base-clang as base -LABEL version="5" +LABEL version="6" ARG DEBIAN_FRONTEND=noninteractive @@ -104,7 +104,7 @@ RUN set -ex; \ # HERA RUN set -ex; \ cd /usr/src; \ - git clone --branch="v0.3.0" --recurse-submodules https://github.com/ewasm/hera.git; \ + git clone --branch="v0.3.2" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \ cd hera; \ mkdir build; \ cd build; \ diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1804 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1804 index 65750a62d..ca6eed20e 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1804 +++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1804 @@ -22,7 +22,7 @@ # (c) 2016-2019 solidity contributors. #------------------------------------------------------------------------------ FROM buildpack-deps:bionic AS base -LABEL version="3" +LABEL version="4" ARG DEBIAN_FRONTEND=noninteractive @@ -84,20 +84,20 @@ RUN set -ex; \ EVMONE_VERSION="$EVMONE_MAJOR.$EVMONE_MINOR.$EVMONE_MICRO"; \ TGZFILE="evmone-$EVMONE_VERSION-linux-x86_64.tar.gz"; \ wget https://github.com/ethereum/evmone/releases/download/v$EVMONE_VERSION/$TGZFILE; \ - sha256sum $TGZFILE; \ + sha256sum $TGZFILE | grep ${EVMONE_HASH}; \ tar xzpf $TGZFILE -C /usr; \ rm -f $TGZFILE; # HERA -ARG HERA_HASH="622663cb3bc1fa07213c6e1fe8070c5c259096e75039a46d014b2a3448b5cf44" +ARG HERA_HASH="1a0b3cf626910c969f0ac86b7a731969a2e5b8254bc4e626b8f3a60471481f03" ARG HERA_MAJOR="0" ARG HERA_MINOR="3" -ARG HERA_MICRO="0" +ARG HERA_MICRO="2" RUN set -ex; \ HERA_VERSION="$HERA_MAJOR.$HERA_MINOR.$HERA_MICRO"; \ TGZFILE="hera-$HERA_VERSION-linux-x86_64.tar.gz"; \ wget https://github.com/ewasm/hera/releases/download/v$HERA_VERSION/$TGZFILE; \ - sha256sum $TGZFILE; \ + sha256sum $TGZFILE | grep ${HERA_HASH}; \ tar xzpf $TGZFILE -C /usr; \ rm -f $TGZFILE; diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 index 6614ff6e7..505f4b585 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 +++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 @@ -22,7 +22,7 @@ # (c) 2016-2019 solidity contributors. #------------------------------------------------------------------------------ FROM buildpack-deps:focal AS base -LABEL version="3" +LABEL version="4" ARG DEBIAN_FRONTEND=noninteractive @@ -60,7 +60,7 @@ RUN set -ex; \ # HERA RUN set -ex; \ cd /usr/src; \ - git clone --branch="v0.3.0" --recurse-submodules https://github.com/ewasm/hera.git; \ + git clone --branch="v0.3.2" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \ cd hera; \ mkdir build; \ cd build; \ diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang index 88314b5a6..4968c148c 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang +++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang @@ -22,7 +22,7 @@ # (c) 2016-2019 solidity contributors. #------------------------------------------------------------------------------ FROM buildpack-deps:focal AS base -LABEL version="3" +LABEL version="4" ARG DEBIAN_FRONTEND=noninteractive @@ -62,7 +62,7 @@ RUN set -ex; \ # HERA RUN set -ex; \ cd /usr/src; \ - git clone --branch="v0.3.0" --recurse-submodules https://github.com/ewasm/hera.git; \ + git clone --branch="v0.3.2" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \ cd hera; \ mkdir build; \ cd build; \ diff --git a/test/Common.h b/test/Common.h index a665d563f..e745ac6ac 100644 --- a/test/Common.h +++ b/test/Common.h @@ -34,17 +34,17 @@ namespace solidity::test static constexpr auto evmoneFilename = "evmone.dll"; static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.4.1/evmone-0.4.1-windows-amd64.zip"; static constexpr auto heraFilename = "hera.dll"; -static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/archive/v0.3.0.tar.gz"; +static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/archive/v0.3.2.tar.gz"; #elif defined(__APPLE__) static constexpr auto evmoneFilename = "libevmone.dylib"; static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.4.1/evmone-0.4.1-darwin-x86_64.tar.gz"; static constexpr auto heraFilename = "libhera.dylib"; -static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.3.0/hera-0.3.0-darwin-x86_64.tar.gz"; +static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.3.2/hera-0.3.2-darwin-x86_64.tar.gz"; #else static constexpr auto evmoneFilename = "libevmone.so"; static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.4.1/evmone-0.4.1-linux-x86_64.tar.gz"; static constexpr auto heraFilename = "libhera.so"; -static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.3.0/hera-0.3.0-linux-x86_64.tar.gz"; +static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.3.2/hera-0.3.2-linux-x86_64.tar.gz"; #endif struct ConfigException : public util::Exception {};