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

Use prebuilt z3 images #3694

Merged
merged 2 commits into from
Oct 5, 2023
Merged

Use prebuilt z3 images #3694

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
ddffad1
.github/, deps/z3: use prebuilt Z3 images
ehildenb Oct 4, 2023
8c05f64
Merge branch 'develop' into z3-images
F-WRunTime Oct 5, 2023
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
9 changes: 1 addition & 8 deletions .github/actions/with-docker/action.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

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