Use only Z3 4.8.12 on Ubuntu 20.04

Older Z3 and Ubuntu versions are causing trouble.
GaloisInc · Aug 24, 2021 · 6db1287 · 6db1287
1 parent ddecf5f
commit 6db1287
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/.github/ci.sh b/.github/ci.sh
@@ -54,7 +54,7 @@ install_z3() {
   is_exe "$BIN" "z3" && return
 
   case "$RUNNER_OS" in
-    Linux) file="ubuntu-18.04.zip" ;;
+    Linux) file="glibc-2.31.zip" ;;
     macOS) file="osx-10.15.7.zip" ;;
     Windows) file="win.zip" ;;
   esac

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ env:
   # ./saw/Dockerfile
   # ./saw-remote-api/Dockerfile
   # ./s2nTests/docker/saw.dockerfile
-  Z3_VERSION: "4.8.10"
+  Z3_VERSION: "4.8.12"
   CVC4_VERSION: "4.1.8"
   YICES_VERSION: "2.6.2"
 
@@ -60,7 +60,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04, macos-latest, windows-latest]
+        os: [ubuntu-20.04, macos-latest, windows-latest]
         ghc: ["8.8.4", "8.10.4"]
     outputs:
       cabal-test-suites-json: ${{ steps.cabal-test-suites.outputs.targets-json }}
@@ -162,7 +162,7 @@ jobs:
           path: dist/bin
           name: ${{ runner.os }}-bins
 
-      - if: "matrix.os == 'ubuntu-18.04'"
+      - if: "matrix.os == 'ubuntu-20.04'"
         uses: actions/upload-artifact@v2
         with:
           name: "saw-${{ runner.os }}-${{ matrix.ghc }}"
@@ -211,11 +211,11 @@ jobs:
       matrix:
         include:
           - test: saw-remote-api/scripts/run_rpc_tests.sh
-            os: ubuntu-18.04
+            os: ubuntu-20.04
           - test: saw-remote-api/scripts/run_rpc_tests.sh
             os: macos-latest
           - test: saw-remote-api/scripts/check_docs.sh
-            os: ubuntu-18.04
+            os: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with:
@@ -263,7 +263,7 @@ jobs:
       fail-fast: false
       matrix:
         suite: ${{ fromJson(needs.build.outputs.cabal-test-suites-json) }}
-        os: [ubuntu-18.04]
+        os: [ubuntu-20.04]
         continue-on-error: [false]
         include:
           - suite: integration_tests
@@ -432,7 +432,7 @@ jobs:
     name: "Test s2n proofs"
     timeout-minutes: 60
     needs: build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:

diff --git a/s2nTests/docker/s2n.dockerfile b/s2nTests/docker/s2n.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 RUN apt-get update -y -q && \
     apt-get install -y software-properties-common && \
@@ -25,4 +25,4 @@ RUN mkdir -p /saw-script && \
 
 COPY scripts/s2n-entrypoint.sh /entrypoint.sh
 ENTRYPOINT [ "/entrypoint.sh" ]
-CMD [ "/bin/bash" ]
+CMD [ "/bin/bash" ]
diff --git a/saw-remote-api/Dockerfile b/saw-remote-api/Dockerfile
@@ -9,8 +9,8 @@ USER user
 WORKDIR /solvers
 RUN mkdir -p rootfs/usr/local/bin
 
-# Get Z3 4.8.10 from GitHub
-RUN curl -L https://github.com/Z3Prover/z3/releases/download/z3-4.8.10/z3-4.8.10-x64-ubuntu-18.04.zip --output z3.zip
+# Get Z3 4.8.12 from GitHub
+RUN curl -L https://github.com/Z3Prover/z3/releases/download/z3-4.8.12/z3-4.8.12-x64-glibc-2.31.zip --output z3.zip
 RUN unzip z3.zip
 RUN mv z3-*/bin/z3 rootfs/usr/local/bin
 

diff --git a/saw/Dockerfile b/saw/Dockerfile
@@ -9,8 +9,8 @@ USER user
 WORKDIR /solvers
 RUN mkdir -p rootfs/usr/local/bin
 
-# Get Z3 4.8.10 from GitHub
-RUN curl -L https://github.com/Z3Prover/z3/releases/download/z3-4.8.10/z3-4.8.10-x64-ubuntu-18.04.zip --output z3.zip
+# Get Z3 4.8.12 from GitHub
+RUN curl -L https://github.com/Z3Prover/z3/releases/download/z3-4.8.12/z3-4.8.12-x64-glibc-2.31.zip --output z3.zip
 RUN unzip z3.zip
 RUN mv z3-*/bin/z3 rootfs/usr/local/bin