cerc-io/solidity
16
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 #12967 from ethereum/update_z3_docker

Browse Source 
Update docker z3 version 4.8.16
This commit is contained in:
Leo 2022-05-12 15:23:03 +02:00 committed by GitHub
commit 2aba061bde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/ci/docker_upgrade.sh
View File

@ -51,7 +51,17 @@ docker build "scripts/docker/${IMAGE_NAME}" --file "scripts/docker/${IMAGE_NAME}
echo "-- test_docker @ '${PWD}'" echo "-- test_docker @ '${PWD}'"
docker run --rm --volume "${PWD}:/root/project" "${IMAGE_NAME}" "/root/project/scripts/ci/${IMAGE_NAME}_test_${IMAGE_VARIANT}.sh" # NOTE: Since /root/project/ is a dir from outside the container and the owner of the files is different,
# git show in the script refuses to work. It must be marked as safe to use first.
# See https://github.blog/2022-04-12-git-security-vulnerability-announced/
docker run \
--rm \
--volume "${PWD}:/root/project" \
"${IMAGE_NAME}" \
bash -c "
git config --global --add safe.directory /root/project &&
/root/project/scripts/ci/${IMAGE_NAME}_test_${IMAGE_VARIANT}.sh
"
echo "-- push_docker" echo "-- push_docker"

4
scripts/docker/buildpack-deps/Dockerfile.emscripten
View File

@ -33,12 +33,12 @@
# Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the # Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
# dependencies automatically. # dependencies automatically.
FROM emscripten/emsdk:2.0.33 AS base FROM emscripten/emsdk:2.0.33 AS base
LABEL version="9" LABEL version="10"
ADD emscripten.jam /usr/src ADD emscripten.jam /usr/src
RUN set -ex; \ RUN set -ex; \
cd /usr/src; \ cd /usr/src; \
git clone https://github.com/Z3Prover/z3.git -b z3-4.8.14 --depth 1 ; \ git clone https://github.com/Z3Prover/z3.git -b z3-4.8.16 --depth 1 ; \
cd z3; \ cd z3; \
mkdir build; \ mkdir build; \
cd build; \ cd build; \

4
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="16" LABEL version="17"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -61,7 +61,7 @@ RUN set -ex; \
# Z3 # Z3
RUN set -ex; \ RUN set -ex; \
git clone --depth 1 -b z3-4.8.14 https://github.com/Z3Prover/z3.git \ git clone --depth 1 -b z3-4.8.16 https://github.com/Z3Prover/z3.git \
/usr/src/z3; \ /usr/src/z3; \
cd /usr/src/z3; \ cd /usr/src/z3; \
mkdir build; \ mkdir build; \

2
scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
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="11" LABEL version="12"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive

2
scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
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="11" LABEL version="12"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive