Bump verif/core-v-verif csr-injection (openhwgroup#2491)

* Bump cvv/csr-injection * Bump core-v-verif * [ci] try to fix the CI * [ci] fix lint * [ci] Fix stages * [ci] Deprecated set-output
Moschn · Sep 4, 2024 · e9382ba · e9382ba
1 parent 6561f2c
commit e9382ba
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,12 @@ jobs:
       with:
         submodules: recursive
 
+    - name: Get specific submodule hash
+      id: core-v-submodule-hash
+      run: |
+        cd verif/core-v-verif
+        echo "hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
     - name: Cache toolchain
       id: cache-toolchain
       uses: actions/cache@v3
@@ -42,8 +48,7 @@ jobs:
           cache-name: cache-spike
       with:
           path: tools/spike/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('verif/regress/install-spike.sh',
-              'verif/core-v-verif/') }}
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('verif/regress/install-spike.sh')}}-${{ steps.core-v-submodule-hash.outputs.hash }}
 
     - name: Prepare
       run: |
@@ -71,6 +76,12 @@ jobs:
       with:
         submodules: recursive
 
+    - name: Get specific submodule hash
+      id: core-v-submodule-hash
+      run: |
+        cd verif/core-v-verif
+        echo "hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
     - name: Cache toolchain
       id: cache-toolchain
       uses: actions/cache@v3
@@ -96,8 +107,7 @@ jobs:
           cache-name: cache-spike
       with:
           path: tools/spike/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('verif/regress/install-spike.sh',
-              'verif/core-v-verif/') }}
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('verif/regress/install-spike.sh')}}-${{ steps.core-v-submodule-hash.outputs.hash }}
 
     - name: Run Tests
       run: |
@@ -132,6 +142,12 @@ jobs:
       with:
         submodules: recursive
 
+    - name: Get specific submodule hash
+      id: core-v-submodule-hash
+      run: |
+        cd verif/core-v-verif
+        echo "hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
     - name: Cache toolchain
       id: cache-toolchain
       uses: actions/cache@v3
@@ -157,8 +173,7 @@ jobs:
           cache-name: cache-spike
       with:
           path: tools/spike/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('verif/regress/install-spike.sh',
-              'verif/core-v-verif/') }}
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('verif/regress/install-spike.sh')}}-${{ steps.core-v-submodule-hash.outputs.hash }}
 
     - name: Run Tests
       run: |

diff --git a/verif/core-v-verif b/verif/core-v-verif