From f72e61ccbe4249b42be95746dea9b0853e6ceb32 Mon Sep 17 00:00:00 2001 From: Leo Alt Date: Tue, 28 Mar 2023 11:02:18 +0200 Subject: [PATCH 1/3] update z3 in docker files --- scripts/docker/buildpack-deps/Dockerfile.emscripten | 4 ++-- .../docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz | 4 ++-- scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 | 2 +- scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 | 2 +- scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten index 551cab495..c170aa3da 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.emscripten +++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten @@ -33,7 +33,7 @@ # Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the # dependencies automatically. FROM emscripten/emsdk:3.1.19 AS base -LABEL version="14" +LABEL version="15" ADD emscripten.jam /usr/src RUN set -ex && \ @@ -42,7 +42,7 @@ RUN set -ex && \ apt-get install lz4 --no-install-recommends && \ \ cd /usr/src && \ - git clone https://github.com/Z3Prover/z3.git -b z3-4.11.2 --depth 1 && \ + git clone https://github.com/Z3Prover/z3.git -b z3-4.12.1 --depth 1 && \ cd z3 && \ mkdir build && \ cd build && \ diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz index 469424ab8..672bd18aa 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz +++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz @@ -22,7 +22,7 @@ # (c) 2016-2021 solidity contributors. #------------------------------------------------------------------------------ FROM gcr.io/oss-fuzz-base/base-clang:latest as base -LABEL version="22" +LABEL version="23" ARG DEBIAN_FRONTEND=noninteractive @@ -61,7 +61,7 @@ RUN set -ex; \ # Z3 RUN set -ex; \ - git clone --depth 1 -b z3-4.11.2 https://github.com/Z3Prover/z3.git \ + git clone --depth 1 -b z3-4.12.1 https://github.com/Z3Prover/z3.git \ /usr/src/z3; \ cd /usr/src/z3; \ mkdir build; \ diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 index 242f859e7..de356f144 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 +++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 @@ -22,7 +22,7 @@ # (c) 2016-2019 solidity contributors. #------------------------------------------------------------------------------ FROM buildpack-deps:focal AS base -LABEL version="16" +LABEL version="17" ARG DEBIAN_FRONTEND=noninteractive diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 index 85cd85ecf..51ab30ac0 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 +++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 @@ -22,7 +22,7 @@ # (c) 2016-2019 solidity contributors. #------------------------------------------------------------------------------ FROM buildpack-deps:jammy AS base -LABEL version="1" +LABEL version="2" ARG DEBIAN_FRONTEND=noninteractive diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang index d7f1c95f1..d0357879e 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang +++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang @@ -22,7 +22,7 @@ # (c) 2016-2019 solidity contributors. #------------------------------------------------------------------------------ FROM buildpack-deps:jammy AS base -LABEL version="1" +LABEL version="2" ARG DEBIAN_FRONTEND=noninteractive From e6f099db927fb6a23a4323b71bd4a5139d715260 Mon Sep 17 00:00:00 2001 From: Leo Alt Date: Tue, 28 Mar 2023 13:19:13 +0200 Subject: [PATCH 2/3] bring ubuntu2004 back --- .github/workflows/buildpack-deps.yml | 3 ++- scripts/ci/buildpack-deps_test_ubuntu2004.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 120000 scripts/ci/buildpack-deps_test_ubuntu2004.sh diff --git a/.github/workflows/buildpack-deps.yml b/.github/workflows/buildpack-deps.yml index afdf03c8f..4d3918d94 100644 --- a/.github/workflows/buildpack-deps.yml +++ b/.github/workflows/buildpack-deps.yml @@ -6,6 +6,7 @@ on: paths: - 'scripts/docker/buildpack-deps/Dockerfile.emscripten' - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz' + - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2004' - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang' - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204' @@ -22,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - image_variant: [emscripten, ubuntu1604.clang.ossfuzz, ubuntu2204.clang, ubuntu2204] + image_variant: [emscripten, ubuntu1604.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204] steps: - uses: actions/checkout@v2 diff --git a/scripts/ci/buildpack-deps_test_ubuntu2004.sh b/scripts/ci/buildpack-deps_test_ubuntu2004.sh new file mode 120000 index 000000000..feb6a5927 --- /dev/null +++ b/scripts/ci/buildpack-deps_test_ubuntu2004.sh @@ -0,0 +1 @@ +./build.sh \ No newline at end of file From 8e5f8c8595d59ac9ca0e42855dd0c2c65e8a53ee Mon Sep 17 00:00:00 2001 From: Leo Alt Date: Wed, 5 Apr 2023 14:55:57 +0200 Subject: [PATCH 3/3] reenable arch smt tests --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e189ea07b..67d52e071 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -955,9 +955,8 @@ jobs: environment: TERM: xterm MAKEFLAGS: -j 5 - # Build without Z3. We won't be running SMT tests on Arch because that requires a specific - # version of Z3 and the one with the official repos is often not the one we need. - USE_Z3: OFF + # This can be switched off if we run out of sync with Arch. + USE_Z3: ON steps: - run: name: Install build dependencies