From b22e2de102bcfb8c2a68e6f17ba8012d9a2062c3 Mon Sep 17 00:00:00 2001 From: Alexander Arlt Date: Wed, 22 Jul 2020 05:12:55 -0500 Subject: [PATCH 1/3] Add hera to buildpacks. --- .github/workflows/buildpack-deps.yml | 4 ++-- .../Dockerfile.ubuntu1604.clang.ossfuzz | 14 +++++++++++++- .../docker/buildpack-deps/Dockerfile.ubuntu1804 | 14 +++++++++++++- .../docker/buildpack-deps/Dockerfile.ubuntu2004 | 14 +++++++++++++- .../buildpack-deps/Dockerfile.ubuntu2004.clang | 14 +++++++++++++- 5 files changed, 54 insertions(+), 6 deletions(-) diff --git a/.github/workflows/buildpack-deps.yml b/.github/workflows/buildpack-deps.yml index 2e2ea547fc54..d183363db732 100644 --- a/.github/workflows/buildpack-deps.yml +++ b/.github/workflows/buildpack-deps.yml @@ -15,7 +15,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - DOCKER_REPOSITORY: solbuildpackpusher/solidity-buildpack-deps + DOCKER_REPOSITORY: docker.pkg.github.com/${{ github.repository }} IMAGE_NAME: buildpack-deps runs-on: ubuntu-latest @@ -32,7 +32,7 @@ jobs: - name: Upgrade ${{ env.IMAGE_NAME }}-${{ matrix.image_variant }} run: | - echo ${DOCKERHUB_TOKEN} | docker login -u solbuildpackpusher --password-stdin + echo ${GITHUB_TOKEN} | docker login docker.pkg.github.com -u ${GITHUB_ACTOR} --password-stdin scripts/ci/docker_upgrade.sh ${{ env.IMAGE_NAME }} ${{ matrix.image_variant }} ${{ env.DOCKER_REPOSITORY }} docker logout diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz index ceea17d8180c..32f84573cf39 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="1" +LABEL version="2" ARG DEBIAN_FRONTEND=noninteractive @@ -96,6 +96,18 @@ RUN set -ex; \ ninja install/strip; \ rm -rf /usr/src/evmone +# HERA +RUN set -ex; \ + cd /usr/src; \ + git clone --branch="v0.3.0" --recurse-submodules https://github.com/ewasm/hera.git; \ + cd hera; \ + mkdir build; \ + cd build; \ + cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..; \ + ninja; \ + ninja install/strip; \ + rm -rf /usr/src/hera + FROM base COPY --from=libraries /usr/lib /usr/lib COPY --from=libraries /usr/bin /usr/bin diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1804 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1804 index 51eed0a9e4ed..78b75dc45c2f 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="1" +LABEL version="2" ARG DEBIAN_FRONTEND=noninteractive @@ -88,6 +88,18 @@ RUN set -ex; \ tar xzpf $TGZFILE -C /usr; \ rm -f $TGZFILE; +# HERA +RUN set -ex; \ + cd /usr/src; \ + git clone --branch="v0.3.0" --recurse-submodules https://github.com/ewasm/hera.git; \ + cd hera; \ + mkdir build; \ + cd build; \ + cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..; \ + ninja; \ + ninja install/strip; \ + rm -rf /usr/src/hera + FROM base COPY --from=libraries /usr/lib /usr/lib COPY --from=libraries /usr/bin /usr/bin diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 index 591e430af77a..80331a85bd46 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="1" +LABEL version="2" ARG DEBIAN_FRONTEND=noninteractive @@ -57,6 +57,18 @@ RUN set -ex; \ ninja install/strip; \ rm -rf /usr/src/evmone +# HERA +RUN set -ex; \ + cd /usr/src; \ + git clone --branch="v0.3.0" --recurse-submodules https://github.com/ewasm/hera.git; \ + cd hera; \ + mkdir build; \ + cd build; \ + cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..; \ + ninja; \ + ninja install/strip; \ + rm -rf /usr/src/hera + FROM base COPY --from=libraries /usr/lib /usr/lib COPY --from=libraries /usr/bin /usr/bin diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang index c1663fdba7a9..fb5cf5669f9a 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="1" +LABEL version="2" ARG DEBIAN_FRONTEND=noninteractive @@ -59,6 +59,18 @@ RUN set -ex; \ ninja install/strip; \ rm -rf /usr/src/evmone +# HERA +RUN set -ex; \ + cd /usr/src; \ + git clone --branch="v0.3.0" --recurse-submodules https://github.com/ewasm/hera.git; \ + cd hera; \ + mkdir build; \ + cd build; \ + cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..; \ + ninja; \ + ninja install/strip; \ + rm -rf /usr/src/hera + FROM base COPY --from=libraries /usr/lib /usr/lib COPY --from=libraries /usr/bin /usr/bin From e26f619662a0d4fb5bddfd0d7d4b61265761ea2f Mon Sep 17 00:00:00 2001 From: Alexander Arlt Date: Wed, 22 Jul 2020 06:11:21 -0500 Subject: [PATCH 2/3] iii --- scripts/ci/docker_upgrade.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci/docker_upgrade.sh b/scripts/ci/docker_upgrade.sh index 16d6222305bf..ce7f092d08c8 100755 --- a/scripts/ci/docker_upgrade.sh +++ b/scripts/ci/docker_upgrade.sh @@ -26,6 +26,7 @@ fi echo "-- check_version" +pwd PREV_VERSION=$(git diff origin/develop HEAD -- "${DOCKERFILE}" | grep -e '^\s*-LABEL\s\+version=".*"\s*$' | awk -F'"' '{ print $2 }') NEXT_VERSION=$(git diff origin/develop HEAD -- "${DOCKERFILE}" | grep -e '^\s*+LABEL\s\+version=".*"\s*$' | awk -F'"' '{ print $2 }') From 56f414e7c8cb48c708cb39fc0cad40b3a4b0f009 Mon Sep 17 00:00:00 2001 From: Alexander Arlt Date: Wed, 22 Jul 2020 06:19:39 -0500 Subject: [PATCH 3/3] remove pwd. --- scripts/ci/docker_upgrade.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci/docker_upgrade.sh b/scripts/ci/docker_upgrade.sh index ce7f092d08c8..16d6222305bf 100755 --- a/scripts/ci/docker_upgrade.sh +++ b/scripts/ci/docker_upgrade.sh @@ -26,7 +26,6 @@ fi echo "-- check_version" -pwd PREV_VERSION=$(git diff origin/develop HEAD -- "${DOCKERFILE}" | grep -e '^\s*-LABEL\s\+version=".*"\s*$' | awk -F'"' '{ print $2 }') NEXT_VERSION=$(git diff origin/develop HEAD -- "${DOCKERFILE}" | grep -e '^\s*+LABEL\s\+version=".*"\s*$' | awk -F'"' '{ print $2 }')