Skip to content

Commit e7eab47

Browse files
author
Aaron Tomb
committed
Use only Z3 4.8.12 on Ubuntu 20.04
Older Z3 and Ubuntu versions are causing trouble.
1 parent e5e7f69 commit e7eab47

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

.github/ci.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ install_z3() {
5454
is_exe "$BIN" "z3" && return
5555

5656
case "$RUNNER_OS" in
57-
Linux) file="ubuntu-18.04.zip" ;;
57+
Linux) file="glibc-2.31.zip" ;;
5858
macOS) file="osx-10.15.7.zip" ;;
5959
Windows) file="win.zip" ;;
6060
esac

.github/workflows/ci.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
# ./saw/Dockerfile
1616
# ./saw-remote-api/Dockerfile
1717
# ./s2nTests/docker/saw.dockerfile
18-
Z3_VERSION: "4.8.10"
18+
Z3_VERSION: "4.8.12"
1919
CVC4_VERSION: "4.1.8"
2020
YICES_VERSION: "2.6.2"
2121

@@ -60,7 +60,7 @@ jobs:
6060
strategy:
6161
fail-fast: false
6262
matrix:
63-
os: [ubuntu-18.04, ubuntu-20.04, macos-latest, windows-latest]
63+
os: [ubuntu-20.04, macos-latest, windows-latest]
6464
ghc: ["8.8.4", "8.10.4"]
6565
outputs:
6666
cabal-test-suites-json: ${{ steps.cabal-test-suites.outputs.targets-json }}
@@ -162,7 +162,7 @@ jobs:
162162
path: dist/bin
163163
name: ${{ runner.os }}-bins
164164

165-
- if: "matrix.os == 'ubuntu-18.04'"
165+
- if: "matrix.os == 'ubuntu-20.04'"
166166
uses: actions/upload-artifact@v2
167167
with:
168168
name: "saw-${{ runner.os }}-${{ matrix.ghc }}"
@@ -211,11 +211,11 @@ jobs:
211211
matrix:
212212
include:
213213
- test: saw-remote-api/scripts/run_rpc_tests.sh
214-
os: ubuntu-18.04
214+
os: ubuntu-20.04
215215
- test: saw-remote-api/scripts/run_rpc_tests.sh
216216
os: macos-latest
217217
- test: saw-remote-api/scripts/check_docs.sh
218-
os: ubuntu-18.04
218+
os: ubuntu-20.04
219219
steps:
220220
- uses: actions/checkout@v2
221221
with:
@@ -263,7 +263,7 @@ jobs:
263263
fail-fast: false
264264
matrix:
265265
suite: ${{ fromJson(needs.build.outputs.cabal-test-suites-json) }}
266-
os: [ubuntu-18.04]
266+
os: [ubuntu-20.04]
267267
continue-on-error: [false]
268268
include:
269269
- suite: integration_tests
@@ -432,7 +432,7 @@ jobs:
432432
name: "Test s2n proofs"
433433
timeout-minutes: 60
434434
needs: build
435-
runs-on: ubuntu-18.04
435+
runs-on: ubuntu-20.04
436436
strategy:
437437
fail-fast: false
438438
matrix:

s2nTests/docker/s2n.dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22

33
RUN apt-get update -y -q && \
44
apt-get install -y software-properties-common && \
@@ -25,4 +25,4 @@ RUN mkdir -p /saw-script && \
2525

2626
COPY scripts/s2n-entrypoint.sh /entrypoint.sh
2727
ENTRYPOINT [ "/entrypoint.sh" ]
28-
CMD [ "/bin/bash" ]
28+
CMD [ "/bin/bash" ]

saw-remote-api/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ USER user
99
WORKDIR /solvers
1010
RUN mkdir -p rootfs/usr/local/bin
1111

12-
# Get Z3 4.8.10 from GitHub
13-
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
12+
# Get Z3 4.8.12 from GitHub
13+
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
1414
RUN unzip z3.zip
1515
RUN mv z3-*/bin/z3 rootfs/usr/local/bin
1616

saw/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ USER user
99
WORKDIR /solvers
1010
RUN mkdir -p rootfs/usr/local/bin
1111

12-
# Get Z3 4.8.10 from GitHub
13-
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
12+
# Get Z3 4.8.12 from GitHub
13+
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
1414
RUN unzip z3.zip
1515
RUN mv z3-*/bin/z3 rootfs/usr/local/bin
1616

0 commit comments

Comments
 (0)