cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13863 from ethereum/bump-ubuntu-images

Browse Source 
Update ubuntu images from `2004` to `2204`
This commit is contained in:
Nikola Matić 2023-01-12 12:34:54 +01:00 committed by GitHub
commit 7c62f35a61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/buildpack-deps.yml vendored
View File

@ -6,8 +6,8 @@ on:
paths: paths:
- 'scripts/docker/buildpack-deps/Dockerfile.emscripten' - 'scripts/docker/buildpack-deps/Dockerfile.emscripten'
- 'scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz' - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz'
- 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang' - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang'
- 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2004' - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204'
jobs: jobs:
buildpack-deps: buildpack-deps:
@ -22,7 +22,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
image_variant: [emscripten, ubuntu1604.clang.ossfuzz, ubuntu2004.clang, ubuntu2004] image_variant: [emscripten, ubuntu1604.clang.ossfuzz, ubuntu2204.clang, ubuntu2204]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

0
scripts/ci/buildpack-deps_test_ubuntu2004.clang.sh → scripts/ci/buildpack-deps_test_ubuntu2204.clang.sh
View File

0
scripts/ci/buildpack-deps_test_ubuntu2004.sh → scripts/ci/buildpack-deps_test_ubuntu2204.sh
View File

10
scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
View File

@ -22,7 +22,7 @@
# (c) 2016-2021 solidity contributors. # (c) 2016-2021 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM gcr.io/oss-fuzz-base/base-clang:latest as base FROM gcr.io/oss-fuzz-base/base-clang:latest as base
LABEL version="21" LABEL version="22"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -46,18 +46,18 @@ FROM base AS libraries
# Boost # Boost
RUN set -ex; \ RUN set -ex; \
cd /usr/src; \ cd /usr/src; \
wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.73.0/source/boost_1_73_0.tar.bz2' -O boost.tar.bz2; \ wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.74.0/source/boost_1_74_0.tar.bz2' -O boost.tar.bz2; \
test "$(sha256sum boost.tar.bz2)" = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402 boost.tar.bz2"; \ test "$(sha256sum boost.tar.bz2)" = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1 boost.tar.bz2" && \
tar -xf boost.tar.bz2; \ tar -xf boost.tar.bz2; \
rm boost.tar.bz2; \ rm boost.tar.bz2; \
cd boost_1_73_0; \ cd boost_1_74_0; \
CXXFLAGS="-stdlib=libc++ -pthread" LDFLAGS="-stdlib=libc++" ./bootstrap.sh --with-toolset=clang --prefix=/usr; \ CXXFLAGS="-stdlib=libc++ -pthread" LDFLAGS="-stdlib=libc++" ./bootstrap.sh --with-toolset=clang --prefix=/usr; \
./b2 toolset=clang cxxflags="-stdlib=libc++ -pthread" linkflags="-stdlib=libc++ -pthread" headers; \ ./b2 toolset=clang cxxflags="-stdlib=libc++ -pthread" linkflags="-stdlib=libc++ -pthread" headers; \
./b2 toolset=clang cxxflags="-stdlib=libc++ -pthread" linkflags="-stdlib=libc++ -pthread" \ ./b2 toolset=clang cxxflags="-stdlib=libc++ -pthread" linkflags="-stdlib=libc++ -pthread" \
link=static variant=release runtime-link=static \ link=static variant=release runtime-link=static \
system filesystem unit_test_framework program_options \ system filesystem unit_test_framework program_options \
install -j $(($(nproc)/2)); \ install -j $(($(nproc)/2)); \
rm -rf /usr/src/boost_1_73_0 rm -rf /usr/src/boost_1_74_0
# Z3 # Z3
RUN set -ex; \ RUN set -ex; \

18
scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 → scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
View File

@ -21,8 +21,8 @@
# #
# (c) 2016-2019 solidity contributors. # (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base FROM buildpack-deps:jammy AS base
LABEL version="16" LABEL version="1"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -38,7 +38,7 @@ RUN set -ex; \
libboost-filesystem-dev libboost-test-dev libboost-system-dev \ libboost-filesystem-dev libboost-test-dev libboost-system-dev \
libboost-program-options-dev \ libboost-program-options-dev \
libcvc4-dev libz3-static-dev z3-static jq \ libcvc4-dev libz3-static-dev z3-static jq \
; \ libcln-dev; \
apt-get install -qy python3-pip python3-sphinx; \ apt-get install -qy python3-pip python3-sphinx; \
pip3 install codecov; \ pip3 install codecov; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
@ -57,18 +57,6 @@ RUN set -ex; \
ninja install/strip; \ ninja install/strip; \
rm -rf /usr/src/evmone rm -rf /usr/src/evmone
# HERA
RUN set -ex; \
cd /usr/src; \
git clone --branch="v0.6.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
cd hera; \
mkdir build; \
cd build; \
cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
ninja; \
ninja install/strip; \
rm -rf /usr/src/hera
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

18
scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang → scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
View File

@ -21,8 +21,8 @@
# #
# (c) 2016-2019 solidity contributors. # (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base FROM buildpack-deps:jammy AS base
LABEL version="16" LABEL version="1"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -39,7 +39,7 @@ RUN set -ex; \
libboost-program-options-dev \ libboost-program-options-dev \
clang \ clang \
libz3-static-dev z3-static jq \ libz3-static-dev z3-static jq \
; \ libcln-dev; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
FROM base AS libraries FROM base AS libraries
@ -59,18 +59,6 @@ RUN set -ex; \
ninja install/strip; \ ninja install/strip; \
rm -rf /usr/src/evmone rm -rf /usr/src/evmone
# HERA
RUN set -ex; \
cd /usr/src; \
git clone --branch="v0.6.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
cd hera; \
mkdir build; \
cd build; \
cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
ninja; \
ninja install/strip; \
rm -rf /usr/src/hera
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