Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker z3 version 4.8.16 #12967

Merged
merged 2 commits into from
May 12, 2022
Merged

Update docker z3 version 4.8.16 #12967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift click to select a range
571d94b
Update docker z3 version
Apr 28, 2022
c64fb7a
docker_upgrade.sh: Workaround for git refusing to work with a repo in…
cameel May 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion scripts/ci/docker_upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 51,17 @@ docker build "scripts/docker/${IMAGE_NAME}" --file "scripts/docker/${IMAGE_NAME}

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"

Expand Down
4 changes: 2 additions & 2 deletions scripts/docker/buildpack-deps/Dockerfile.emscripten
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 33,12 @@
# Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
# dependencies automatically.
FROM emscripten/emsdk:2.0.33 AS base
LABEL version="9"
LABEL version="10"

ADD emscripten.jam /usr/src
RUN set -ex; \
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; \
mkdir build; \
cd build; \
Expand Down
4 changes: 2 additions & 2 deletions scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 22,7 @@
# (c) 2016-2021 solidity contributors.
#------------------------------------------------------------------------------
FROM gcr.io/oss-fuzz-base/base-clang:latest as base
LABEL version="16"
LABEL version="17"

ARG DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -61,7 61,7 @@ RUN set -ex; \

# Z3
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; \
cd /usr/src/z3; \
mkdir build; \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 22,7 @@
# (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base
LABEL version="11"
LABEL version="12"

ARG DEBIAN_FRONTEND=noninteractive

Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 22,7 @@
# (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base
LABEL version="11"
LABEL version="12"

ARG DEBIAN_FRONTEND=noninteractive

Expand Down