From 2d4aa20a69326cf826661dbbf57590c7e209cf77 Mon Sep 17 00:00:00 2001
From: Aaron Tomb <atomb@galois.com>
Date: Thu, 17 Jun 2021 13:51:38 -0700
Subject: [PATCH] [CI] Download pre-built abc binary in more cases

---
 .github/workflows/ci.yml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f80def894..6aaa561f8d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -201,6 +201,12 @@ jobs:
           name: "${{ runner.os }}-bins"
           path: dist/bin
 
+      - if: runner.os != 'Windows'
+        uses: actions/download-artifact@v2
+        with:
+          path: bin
+          name: abc-${{ runner.os }}
+
       - uses: actions/setup-python@v2
         with:
           python-version: '3.9'
@@ -213,7 +219,7 @@ jobs:
         shell: bash
         run: |
           chmod +x dist/bin/*
-          export PATH="$PWD/dist/bin:$PATH"
+          export PATH="$PWD/dist/bin:$PWD/bin:$PATH"
           ${{ matrix.test }}
 
   cabal-test:
@@ -256,18 +262,14 @@ jobs:
         if: "runner.os != 'Windows'"
         run: chmod +x dist/bin/*
 
-      - if: |
-          runner.os != 'Windows' &&
-          matrix.suite == 'integration_tests'
+      - if: runner.os != 'Windows'
         uses: actions/download-artifact@v2
         with:
           path: bin
           name: abc-${{ runner.os }}
 
       - shell: bash
-        if: |
-          runner.os != 'Windows' &&
-          matrix.suite == 'integration_tests'
+        if: runner.os != 'Windows'
         run: chmod +x bin/*
 
       - uses: actions/download-artifact@v2
@@ -421,6 +423,11 @@ jobs:
           name: "saw-Linux-${{ matrix.ghc }}"
           path: ./s2nTests/bin
 
+      - uses: actions/download-artifact@v2
+        with:
+          path: ./s2nTests/bin
+          name: abc-${{ runner.os }}
+
       - shell: bash
         working-directory: s2nTests
         run: |