mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #12312 from ethereum/update_docker_z3
Bump z3 version to 4.8.13 in our docker files
This commit is contained in:
commit
e0c85c6f58
@ -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="7"
|
||||
LABEL version="8"
|
||||
|
||||
ADD emscripten.jam /usr/src
|
||||
RUN set -ex; \
|
||||
cd /usr/src; \
|
||||
git clone https://github.com/Z3Prover/z3.git -b z3-4.8.12 --depth 1 ; \
|
||||
git clone https://github.com/Z3Prover/z3.git -b z3-4.8.13 --depth 1 ; \
|
||||
cd z3; \
|
||||
mkdir build; \
|
||||
cd build; \
|
||||
|
@ -22,7 +22,7 @@
|
||||
# (c) 2016-2021 solidity contributors.
|
||||
#------------------------------------------------------------------------------
|
||||
FROM gcr.io/oss-fuzz-base/base-clang:latest as base
|
||||
LABEL version="13"
|
||||
LABEL version="14"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
@ -61,7 +61,7 @@ RUN set -ex; \
|
||||
|
||||
# Z3
|
||||
RUN set -ex; \
|
||||
git clone --depth 1 -b z3-4.8.12 https://github.com/Z3Prover/z3.git \
|
||||
git clone --depth 1 -b z3-4.8.13 https://github.com/Z3Prover/z3.git \
|
||||
/usr/src/z3; \
|
||||
cd /usr/src/z3; \
|
||||
mkdir build; \
|
||||
@ -102,18 +102,6 @@ RUN set -ex; \
|
||||
ninja install/strip; \
|
||||
rm -rf /usr/src/evmone
|
||||
|
||||
# HERA
|
||||
RUN set -ex; \
|
||||
cd /usr/src; \
|
||||
git clone --branch="v0.5.0" --depth 1 --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
|
||||
|
||||
# gmp
|
||||
RUN set -ex; \
|
||||
# Replace system installed libgmp static library
|
||||
|
@ -22,7 +22,7 @@
|
||||
# (c) 2016-2019 solidity contributors.
|
||||
#------------------------------------------------------------------------------
|
||||
FROM buildpack-deps:focal AS base
|
||||
LABEL version="8"
|
||||
LABEL version="9"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
|
@ -22,7 +22,7 @@
|
||||
# (c) 2016-2019 solidity contributors.
|
||||
#------------------------------------------------------------------------------
|
||||
FROM buildpack-deps:focal AS base
|
||||
LABEL version="8"
|
||||
LABEL version="9"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user