Fix CI

MarioOpenHWGroup · Feb 27, 2024 · 7f9c8fd · 7f9c8fd
1 parent 22c2b5c
commit 7f9c8fd
Showing 1 changed file with 23 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,15 +21,15 @@ jobs:
           ci/setup.sh
 
     - name: Cache tools
-    id: cache-tools
-    uses: actions/cache@v3
-    env:
-        cache-name: cache-tools
-    with:
-        # npm cache files are stored in `~/.npm` on Linux/macOS
-        path: tools/
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('verif/core-v-verif/vendor/riscv/',
-            'verif/regress/install-verilator.sh', 'verif/regress/install-spike.sh', 'ci/') }}
+      id: cache-tools
+      uses: actions/cache@v3
+      env:
+          cache-name: cache-tools
+      with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: tools/
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('verif/core-v-verif/vendor/riscv/',
+              'verif/regress/install-verilator.sh', 'verif/regress/install-spike.sh', 'ci/') }}
 
 
   execute-riscv-tests:
@@ -40,32 +40,30 @@ jobs:
     strategy:
       matrix:
         testcase: [ verif/regress/dv-riscv-arch-test.sh , verif/regress/smoke-tests.sh ]
-        target: [ veri-testharness ]
+        target:   [ veri-testharness ]
     needs:
       build-riscv-tests
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
     - name: Cache tools
-    id: cache-tools
-    uses: actions/cache@v3
-    env:
-        cache-name: cache-tools
-    with:
-        # npm cache files are stored in `~/.npm` on Linux/macOS
-        path: tools/
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('verif/core-v-verif/vendor/riscv/',
-            'verif/regress/install-verilator.sh', 'verif/regress/install-spike.sh', 'ci/') }}
-        restore-keys: |
-        ${{ runner.os }}-build-${{ env.cache-name }}-
+      id: cache-tools
+      uses: actions/cache@v3
+      env:
+          cache-name: cache-tools
+      with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: tools/
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('verif/core-v-verif/vendor/riscv/',
+              'verif/regress/install-verilator.sh', 'verif/regress/install-spike.sh', 'ci/') }}
+          restore-keys:  |
+              ${{ runner.os }}-build-${{ env.cache-name }}- 
+
 
-      - if: ${{ steps.cache-tools.outputs.cache-hit != 'true' }}
-        name: List the versions of the tool
-        continue-on-error: true
-        run: ./tools/spike/bin/spike -v || ./tools/bin/verilator -v
     - name: Run Tests
       run: |
+          ./tools/spike/bin/spike -v || ./tools/bin/verilator -v
           set -x
           export RISCV=$(pwd)/tools/riscv-toolchain/
           tar xf tools.tar.gz