Merge pull request #11649 from ethereum/evmone-upgrade

Updated evmone version to 0.8.0 and evmc version to 9.0.0
This commit is contained in:
Harikrishnan Mulackal 2021-07-27 16:34:17 +02:00 committed by GitHub
commit e3184c737a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 12 deletions

View File

@ -22,7 +22,7 @@
# (c) 2016-2019 solidity contributors. # (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM gcr.io/oss-fuzz-base/base-clang as base FROM gcr.io/oss-fuzz-base/base-clang as base
LABEL version="10" LABEL version="11"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -92,7 +92,7 @@ RUN set -ex; \
# EVMONE # EVMONE
RUN set -ex; \ RUN set -ex; \
cd /usr/src; \ cd /usr/src; \
git clone --branch="v0.7.0" --recurse-submodules https://github.com/ethereum/evmone.git; \ git clone --branch="v0.8.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
cd evmone; \ cd evmone; \
mkdir build; \ mkdir build; \
cd build; \ cd build; \
@ -104,7 +104,7 @@ RUN set -ex; \
# HERA # HERA
RUN set -ex; \ RUN set -ex; \
cd /usr/src; \ cd /usr/src; \
git clone --branch="v0.3.2-evmc8" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \ git clone --branch="v0.5.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
cd hera; \ cd hera; \
mkdir build; \ mkdir build; \
cd build; \ cd build; \
@ -146,4 +146,4 @@ RUN set -ex; \
FROM base FROM base
COPY --from=libraries /usr/lib /usr/lib COPY --from=libraries /usr/lib /usr/lib
COPY --from=libraries /usr/bin /usr/bin COPY --from=libraries /usr/bin /usr/bin
COPY --from=libraries /usr/include /usr/include COPY --from=libraries /usr/include /usr/include

View File

@ -22,7 +22,7 @@
# (c) 2016-2019 solidity contributors. # (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base FROM buildpack-deps:focal AS base
LABEL version="7" LABEL version="8"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -48,7 +48,7 @@ FROM base AS libraries
# EVMONE # EVMONE
RUN set -ex; \ RUN set -ex; \
cd /usr/src; \ cd /usr/src; \
git clone --branch="v0.7.0" --recurse-submodules https://github.com/ethereum/evmone.git; \ git clone --branch="v0.8.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
cd evmone; \ cd evmone; \
mkdir build; \ mkdir build; \
cd build; \ cd build; \
@ -60,7 +60,7 @@ RUN set -ex; \
# HERA # HERA
RUN set -ex; \ RUN set -ex; \
cd /usr/src; \ cd /usr/src; \
git clone --branch="v0.3.2-evmc8" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \ git clone --branch="v0.5.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
cd hera; \ cd hera; \
mkdir build; \ mkdir build; \
cd build; \ cd build; \
@ -73,4 +73,3 @@ FROM base
COPY --from=libraries /usr/lib /usr/lib COPY --from=libraries /usr/lib /usr/lib
COPY --from=libraries /usr/bin /usr/bin COPY --from=libraries /usr/bin /usr/bin
COPY --from=libraries /usr/include /usr/include COPY --from=libraries /usr/include /usr/include

View File

@ -22,7 +22,7 @@
# (c) 2016-2019 solidity contributors. # (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base FROM buildpack-deps:focal AS base
LABEL version="7" LABEL version="8"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -50,7 +50,7 @@ ENV CXX clang++
# EVMONE # EVMONE
RUN set -ex; \ RUN set -ex; \
cd /usr/src; \ cd /usr/src; \
git clone --branch="v0.7.0" --recurse-submodules https://github.com/ethereum/evmone.git; \ git clone --branch="v0.8.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
cd evmone; \ cd evmone; \
mkdir build; \ mkdir build; \
cd build; \ cd build; \
@ -62,7 +62,7 @@ RUN set -ex; \
# HERA # HERA
RUN set -ex; \ RUN set -ex; \
cd /usr/src; \ cd /usr/src; \
git clone --branch="v0.3.2-evmc8" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \ git clone --branch="v0.5.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
cd hera; \ cd hera; \
mkdir build; \ mkdir build; \
cd build; \ cd build; \
@ -75,4 +75,3 @@ FROM base
COPY --from=libraries /usr/lib /usr/lib COPY --from=libraries /usr/lib /usr/lib
COPY --from=libraries /usr/bin /usr/bin COPY --from=libraries /usr/bin /usr/bin
COPY --from=libraries /usr/include /usr/include COPY --from=libraries /usr/include /usr/include