From bbb0cd70e2add16a7147f670cd0fe38a84f2ef7a Mon Sep 17 00:00:00 2001
From: chick <chick@qrhino.com>
Date: Mon, 4 Oct 2021 14:28:22 -0700
Subject: [PATCH] Per changes requested round 2 - In main workflow
 chipyard-run-tests.yml   - Remove debug output in `make-keys`   - remove
 export intializers in `build-extra-tests`   - Add prepare-chipyard-fpga to
 `needs` in `all_tests_passed`

---
 .github/workflows/chipyard-run-tests.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml
index 44ce27fc..2efac52d 100644
--- a/.github/workflows/chipyard-run-tests.yml
+++ b/.github/workflows/chipyard-run-tests.yml
@@ -75,11 +75,6 @@ jobs:
           echo "::set-output name=riscvtools-cache-key::riscv-tools-installed-${{ env.tools-cache-version }}-$(shasum riscv-tools.hash | cut -d' ' -f1)"
           echo "::set-output name=esptools-cache-key::esp-tools-installed-${{ env.tools-cache-version }}-$(shasum esp-tools.hash | cut -d' ' -f1)"
           echo "::set-output name=extra-tests-cache-key::extra-tests-${{ github.ref }}-${{ github.sha }}"
-      - name: Show key
-        run: |
-          echo "riscvtools key is " ${{ steps.genkey.outputs.riscvtools-cache-key }}
-          echo "esptools key is " ${{ steps.genkey.outputs.esptools-cache-key }}
-          echo "extra-tests key is " ${{ steps.genkey.outputs.extra-tests-cache-key }}
     outputs:
       riscvtools-cache-key: ${{ steps.genkey.outputs.riscvtools-cache-key }}
       esptools-cache-key: ${{ steps.genkey.outputs.esptools-cache-key }}
@@ -145,11 +140,7 @@ jobs:
           key: ${{ needs.make-keys.outputs.extra-tests-cache-key }}
           restore-keys: ${{ needs.make-keys.outputs.extra-tests-cache-key }}
       - name: Build extra tests if not cached
-        run: |
-          export RISCV="/__w/chipyard/chipyard/riscv-tools-install"
-          export LD_LIBRARY_PATH="$RISCV/lib"
-          export PATH="$RISCV/bin:$PATH"
-          .github/scripts/build-extra-tests.sh
+        run: .github/scripts/build-extra-tests.sh
 
   install-verilator:
     name: install-verilator
@@ -1102,6 +1093,7 @@ jobs:
             chipyard-gemmini-run-tests, chipyard-nvdla-run-tests,
             tracegen-boom-run-tests, tracegen-run-tests,
             icenet-run-tests, testchipip-run-tests,
+            prepare-chipyard-fpga,
             firesim-run-tests, fireboom-run-tests, firesim-multiclock-run-tests]
     runs-on: ubuntu-latest
     steps: