From 26b3b3c61e55f02c6a77d0a30593102a6784422c Mon Sep 17 00:00:00 2001
From: Everett Hildenbrandt <everett.hildenbrandt@gmail.com>
Date: Thu, 5 Oct 2023 13:02:02 -0600
Subject: [PATCH] .github/workflows: use z3-images repository for prebuilt z3
 images (#2104)

* .github/workflows: use z3-images repository for prebuilt z3 images

* Set Version: 1.0.312

---------

Co-authored-by: devops <devops@runtimeverification.com>
---
 .github/actions/with-docker/action.yml |  6 +-----
 .github/workflows/Dockerfile           |  2 +-
 .github/workflows/Dockerfile.z3        | 22 ----------------------
 deps/z3                                |  1 +
 kevm-pyk/pyproject.toml                |  2 +-
 kevm-pyk/src/kevm_pyk/__init__.py      |  2 +-
 package/version                        |  2 +-
 7 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 .github/workflows/Dockerfile.z3
 create mode 100644 deps/z3

diff --git a/.github/actions/with-docker/action.yml b/.github/actions/with-docker/action.yml
index b07d95e0e3..245239eab7 100644
--- a/.github/actions/with-docker/action.yml
+++ b/.github/actions/with-docker/action.yml
@@ -53,15 +53,11 @@ runs:
 
       USER=github-user
       GROUP=${USER}
-      Z3_VERSION=4.12.1
+      Z3_VERSION=$(cat deps/z3)
       K_VERSION=$(cat deps/k_release)
       USER_ID=1000
       GROUP_ID=${USER_ID}
 
-      docker build .                           \
-        --file .github/workflows/Dockerfile.z3 \
-        --tag z3:${Z3_VERSION}                 \
-
       docker build . --file ${DOCKERFILE}        \
         --tag ${TAG_NAME}                        \
         --build-arg USER_ID=${USER_ID}           \
diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile
index 17e5b9092e..4d26a6f278 100644
--- a/.github/workflows/Dockerfile
+++ b/.github/workflows/Dockerfile
@@ -6,7 +6,7 @@ ARG LLVM_VERSION
 FROM ghcr.io/foundry-rs/foundry:nightly-ca67d15f4abd46394b324c50e21e66f306a1162d as FOUNDRY
 
 ARG Z3_VERSION
-FROM z3:${Z3_VERSION} as Z3
+FROM runtimeverificationinc/ubuntu-jammy-z3:${Z3_VERSION} as Z3
 
 ARG K_VERSION
 FROM runtimeverificationinc/kframework-k:ubuntu-jammy-${K_VERSION}
diff --git a/.github/workflows/Dockerfile.z3 b/.github/workflows/Dockerfile.z3
deleted file mode 100644
index 834240f29f..0000000000
--- a/.github/workflows/Dockerfile.z3
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM ubuntu:jammy
-
-ENV TZ=America/Chicago
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN    apt-get update        \
-    && apt-get upgrade --yes \
-    && apt-get install --yes \
-            clang            \
-            cmake            \
-            git              \
-            python3
-
-ARG Z3_VERSION=4.12.1
-RUN    git clone 'https://github.com/z3prover/z3' --branch=z3-${Z3_VERSION} \
-    && cd z3                                                                \
-    && python3 scripts/mk_make.py                                           \
-    && cd build                                                             \
-    && make -j8                                                             \
-    && make install                                                         \
-    && cd ../..                                                             \
-    && rm -rf z3
diff --git a/deps/z3 b/deps/z3
new file mode 100644
index 0000000000..53cf85e173
--- /dev/null
+++ b/deps/z3
@@ -0,0 +1 @@
+4.12.1
diff --git a/kevm-pyk/pyproject.toml b/kevm-pyk/pyproject.toml
index 5060ea4b0d..70ee51903e 100644
--- a/kevm-pyk/pyproject.toml
+++ b/kevm-pyk/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "kevm-pyk"
-version = "1.0.311"
+version = "1.0.312"
 description = ""
 authors = [
     "Runtime Verification, Inc. <contact@runtimeverification.com>",
diff --git a/kevm-pyk/src/kevm_pyk/__init__.py b/kevm-pyk/src/kevm_pyk/__init__.py
index 451f492103..fd9db9e29c 100644
--- a/kevm-pyk/src/kevm_pyk/__init__.py
+++ b/kevm-pyk/src/kevm_pyk/__init__.py
@@ -6,4 +6,4 @@
     from typing import Final
 
 
-VERSION: Final = '1.0.311'
+VERSION: Final = '1.0.312'
diff --git a/package/version b/package/version
index 5039e3d723..6c252d93e9 100644
--- a/package/version
+++ b/package/version
@@ -1 +1 @@
-1.0.311
+1.0.312