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

Jump to bottom

Run s2n tests for only one GHC version #1386

Closed
wants to merge 8 commits into from
Closed

Run s2n tests for only one GHC version #1386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
390f362
Update CI to use GHC 8.10.4 instead of 8.10.3
Jul 28, 2021
3c55685
Revamp the GHC/OS matrix
Jul 28, 2021
37e3da8
Remove unnecessary what4 flags from freeze file
Jul 28, 2021
4383be8
Remove what4 constraints for GHC 8.8.4
Jul 30, 2021
3708907
Re-freeze for GHC 8.10.4
Jul 30, 2021
3734e71
Freeze file for GHC 8.10.4 with tests enabled
Jul 30, 2021
c8127e1
Attempt a fix to the ocaml-tests job
Jul 30, 2021
4d1c15d
Use only Z3 4.8.12 on Ubuntu 20.04
Aug 4, 2021
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
2 changes: 1 addition & 1 deletion .github/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
path: dist/bin
name: ${{ runner.os }}-bins

- if: "matrix.os == 'ubuntu-18.04'"
- if: "matrix.os == 'ubuntu-20.04'"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be better to make this if: runner.os == 'Linux' so that it's immunized against future ubuntu release updates?

The concern here is that the matrix entries might be updated without checking the rest of the file for matches and suddenly this step silently stops being run.

uses: actions/upload-artifact@v2
with:
name: "saw-${{ runner.os }}-${{ matrix.ghc }}"
Expand Down Expand Up @@ -200,6 +200,7 @@ jobs:
- uses: ocaml/setup-ocaml@v2
with:
ocaml-compiler: 4.09.x # coq-bits claims to support < 4.10 only
opam-depext: false

- run: opam repo add coq-released https://coq.inria.fr/opam/released

Expand All @@ -224,11 +225,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:
Expand Down Expand Up @@ -276,7 +277,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
Expand Down Expand Up @@ -445,7 +446,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:
Expand All @@ -458,7 +459,7 @@ jobs:
- hmac-failure
- awslc
- blst
ghc: ["8.10.3"]
ghc: ["8.10.4"]
steps:
- uses: actions/checkout@v2
- run: |
Expand Down
Loading