From 2ca46d0aa9cb0d7b1fa8514a417af482437ed39e Mon Sep 17 00:00:00 2001 From: Arjun Viswanathan Date: Thu, 9 Jun 2022 15:27:32 -0700 Subject: [PATCH 1/3] Interpreter was calling the wrong solver for w4_offline_smtlib2. Small fix --- src/SAWScript/Interpreter.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SAWScript/Interpreter.hs b/src/SAWScript/Interpreter.hs index f5e6c289d4..e637cba871 100644 --- a/src/SAWScript/Interpreter.hs +++ b/src/SAWScript/Interpreter.hs @@ -1740,7 +1740,7 @@ primitives = Map.fromList [ "Write the current goal to the given file in SMT-Lib2 format." ] , prim "w4_offline_smtlib2" "String -> ProofScript ()" - (pureVal offline_smtlib2) + (pureVal w4_offline_smtlib2) Current [ "Write the current goal to the given file in SMT-Lib2 format." ] From eedcba1126f7c501ae443ee3fb5b8b07358acbe1 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Fri, 10 Jun 2022 08:13:57 -0400 Subject: [PATCH 2/3] CI: Don't sign build artifacts on forks The GPG signing step requires access to repository secrets that (apparently) aren't visible to forks. Let's just not sign build artifacts on forks to avoid this issue. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02cefad6b7..8a0bf4536a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,14 +156,14 @@ jobs: - shell: bash run: .github/ci.sh zip_dist_with_solvers $NAME-with-solvers - - if: matrix.ghc == '8.10.7' + - if: matrix.ghc == '8.10.7' && ${{ !github.event.pull_request.head.repo.fork }} shell: bash env: SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} SIGNING_KEY: ${{ secrets.SIGNING_KEY }} run: .github/ci.sh sign $NAME.tar.gz - - if: matrix.ghc == '8.10.7' + - if: matrix.ghc == '8.10.7' && ${{ !github.event.pull_request.head.repo.fork }} shell: bash env: SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} From ac082b0dd95b966a006a26de6e6564b2ffe523e3 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Fri, 10 Jun 2022 08:50:03 -0400 Subject: [PATCH 3/3] CI: Tweak syntax --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a0bf4536a..6599c45cc0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,14 +156,14 @@ jobs: - shell: bash run: .github/ci.sh zip_dist_with_solvers $NAME-with-solvers - - if: matrix.ghc == '8.10.7' && ${{ !github.event.pull_request.head.repo.fork }} + - if: matrix.ghc == '8.10.7' && github.event.pull_request.head.repo.fork == false shell: bash env: SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} SIGNING_KEY: ${{ secrets.SIGNING_KEY }} run: .github/ci.sh sign $NAME.tar.gz - - if: matrix.ghc == '8.10.7' && ${{ !github.event.pull_request.head.repo.fork }} + - if: matrix.ghc == '8.10.7' && github.event.pull_request.head.repo.fork == false shell: bash env: SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}