Skip to content

Commit

Permalink
Use prebuilt z3 images (#3694)
Browse files Browse the repository at this point in the history
This uses the prebuilt Z3 images from:
https://github.com/runtimeverification/z3-images

This should speed up CI process.

Note that the debian packagaes are not changed in Z3 image used, just
the normal CI. So we are still testing with version 4.8.15 as well in
the packaging process. We could also change that to 4.12.1, but then we
wouldn't be testing the minimum recommended version.

Co-authored-by: Freeman <[email protected]>
  • Loading branch information
ehildenb and F-WRunTime authored Oct 5, 2023
1 parent b3c4644 commit 8abe514
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 33 deletions.
9 changes: 1 addition & 8 deletions .github/actions/with-docker/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,13 @@ runs:
run: |
set -euxo pipefail
Z3_VERSION=4.8.15
Z3_VERSION=$(cat deps/z3)
K_VERSION=$(cat ${SUBDIR}package/version)
USER=$(id -un)
USER_ID=$(id -u)
GROUP=$(id -gn)
GROUP_ID=$(id -g)
docker build ${SUBDIR} \
--build-arg USER=${USER} --build-arg USER_ID=${USER_ID} \
--build-arg GROUP=${GROUP} --build-arg GROUP_ID=${GROUP_ID} \
--build-arg BASE_OS=${BASE_OS} \
--build-arg BASE_DISTRO=${BASE_DISTRO} \
--tag z3:${BASE_DISTRO}-${Z3_VERSION} \
--file ${SUBDIR}${DOCKERFILE}.z3
docker build ${SUBDIR} \
--build-arg USER=${USER} --build-arg USER_ID=${USER_ID} \
--build-arg GROUP=${GROUP} --build-arg GROUP_ID=${GROUP_ID} \
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
ARG BASE_OS
ARG BASE_DISTRO
ARG K_VERSION

ARG Z3_VERSION
FROM z3:${BASE_DISTRO}-${Z3_VERSION} as Z3
FROM runtimeverificationinc/${BASE_OS}-${BASE_DISTRO}-z3:${Z3_VERSION} as Z3

ARG BASE_OS
ARG BASE_DISTRO
Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/Dockerfile.z3

This file was deleted.

1 change: 1 addition & 0 deletions deps/z3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4.12.1

0 comments on commit 8abe514

Please sign in to comment.