diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e88f61ad0..08e80fc9a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -498,7 +498,7 @@ jobs: s2n-tests: name: "Test s2n proofs" - timeout-minutes: 60 + timeout-minutes: 120 needs: build runs-on: ubuntu-18.04 strategy: diff --git a/s2nTests/docker/awslc.dockerfile b/s2nTests/docker/awslc.dockerfile index 7f5267fb45..d05b6f99ed 100644 --- a/s2nTests/docker/awslc.dockerfile +++ b/s2nTests/docker/awslc.dockerfile @@ -7,7 +7,7 @@ WORKDIR /saw-script RUN mkdir -p /saw-script && \ git clone https://github.com/GaloisInc/aws-lc-verification.git && \ cd aws-lc-verification && \ - git checkout 7acbcfadd2e040b63cc33e8143e3f8e972408288 && \ + git checkout 1dcf4258305ce17592fb5b90a1c7b638e6bdff9e && \ git config --file=.gitmodules submodule.src.url https://github.com/awslabs/aws-lc && \ git submodule sync && \ git submodule update --init diff --git a/s2nTests/scripts/awslc-entrypoint.sh b/s2nTests/scripts/awslc-entrypoint.sh index 62ca1eb26f..afe2953913 100755 --- a/s2nTests/scripts/awslc-entrypoint.sh +++ b/s2nTests/scripts/awslc-entrypoint.sh @@ -3,6 +3,7 @@ set -xe cd /saw-script/aws-lc-verification/SAW ./scripts/install.sh +rm bin/saw cp /saw-bin/saw bin/saw cp /saw-bin/abc bin/abc