cerc-io/solidity
11
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 #13026 from ethereum/develop

Browse Source 
Merge develop into breaking.
This commit is contained in:
chriseth
2022-05-16 15:29:39 +02:00
committed by GitHub
parent a137d42094 a3bd01d9fc
commit 3c2cee5836
43 changed files with 292 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build_emscripten.sh
+2 -2
View File
@@ -34,7 +34,7 @@ else
BUILD_DIR="$1"
fi
# solbuildpackpusher/solidity-buildpack-deps:emscripten-10
# solbuildpackpusher/solidity-buildpack-deps:emscripten-11
docker run -v "$(pwd):/root/project" -w /root/project \
solbuildpackpusher/solidity-buildpack-deps@sha256:bd23831e0025e35a106005b4ac06cb3618f690bfa2833a5881b573c02d35d9fc\
solbuildpackpusher/solidity-buildpack-deps@sha256:0ad7c65e8c54d926ba9cb80d56246e4fc49f9284ad5188aaaa4834f46ab0c315 \
./scripts/ci/build_emscripten.sh "$BUILD_DIR"
scripts/ci/docker_upgrade.sh
+11 -1
View File
@@ -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"
scripts/deps-ppa/static_z3.sh
+1 -1
View File
@@ -25,7 +25,7 @@ set -ev
keyid=70D110489D66E2F6
email=builds@ethereum.org
packagename=z3-static
version=4.8.16
version=4.8.17
DISTRIBUTIONS="focal impish jammy"
scripts/docker/buildpack-deps/Dockerfile.emscripten
+2 -2
View File
@@ -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="11"
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.17 --depth 1 ; \
cd z3; \
mkdir build; \
cd build; \
scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+2 -2
View File
@@ -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="18"
ARG DEBIAN_FRONTEND=noninteractive
@@ -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.17 https://github.com/Z3Prover/z3.git \
/usr/src/z3; \
cd /usr/src/z3; \
mkdir build; \
scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+1 -1
View File
@@ -22,7 +22,7 @@
# (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base
LABEL version="11"
LABEL version="13"
ARG DEBIAN_FRONTEND=noninteractive
scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
+1 -1
View File
@@ -22,7 +22,7 @@
# (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base
LABEL version="11"
LABEL version="13"
ARG DEBIAN_FRONTEND=noninteractive
scripts/error_codes.py
+1 -1
View File
@@ -231,7 +231,7 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
"3893", "3996", "4010", "4802",
"5272", "5622", "7128", "7400",
"7589", "7593", "7649", "7710",
"8065", "8084", "8140",
"8065", "8084", "8140", "8158",
"8312", "8592", "9134", "9609",
}