From c83838c6b7bb8c8bcf7d3026a2e0f250ff1c307b Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Fri, 31 Mar 2023 08:29:59 -0700
Subject: [PATCH] Bump CI

---
 .github/workflows/chipyard-run-tests.yml | 29 +++---------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml
index 86ce5675..4bb28597 100644
--- a/.github/workflows/chipyard-run-tests.yml
+++ b/.github/workflows/chipyard-run-tests.yml
@@ -392,7 +392,7 @@ jobs:
 
   chipyard-spike-gemmini-run-tests:
     name: chipyard-spike-gemmini-run-tests
-    needs: prepare-chipyard-accels # technically doesn't depend on RTL
+    needs: prepare-chipyard-accels # technically doesn't depend on RTL but should be after the build.sh for Gemmini
     runs-on: self-hosted
     steps:
       - name: Delete old checkout
@@ -409,12 +409,12 @@ jobs:
         uses: ./.github/actions/create-conda-env
       - name: Build Gemmini FireMarshal
         run: |
-          conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-${{ inputs.toolchain }}
+          conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
           cd software/firemarshal && ./init-submodules.sh
           cd generators/gemmini/software && ${{ github.workspace }}/software/firemarshal/marshal -v -d build gemmini-smoke.json
       - name: Running Gemmini FireMarshal smoke test
         run: |
-          conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-${{ inputs.toolchain }}
+          conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
           cd generators/gemmini/software && ${{ github.workspace }}/software/firemarshal/marshal -v -d launch -s gemmini-smoke.json
 
   chipyard-rocket-run-tests:
@@ -693,29 +693,6 @@ jobs:
           group-key: "group-accels"
           project-key: "chipyard-gemmini"
 
-  chipyard-gemmini-spike-run-tests:
-    name: chipyard-gemmini-spike-run-tests
-    needs: prepare-chipyard-accels
-    runs-on: self-hosted
-    steps:
-      - name: Delete old checkout
-        run: |
-            ls -alh .
-            rm -rf ${{ github.workspace }}/* || true
-            rm -rf ${{ github.workspace }}/.* || true
-            ls -alh .
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Git workaround
-        uses: ./.github/actions/git-workaround
-      - name: Create conda env
-        uses: ./.github/actions/create-conda-env
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-accels"
-          project-key: "chipyard-gemmini-spike"
-
   chipyard-manymmioaccels-run-tests:
     name: chipyard-manymmioaccels-run-tests
     needs: prepare-chipyard-accels