From 80613679ee1f633fc42e2dfd92d3bef4f58df8f3 Mon Sep 17 00:00:00 2001
From: JumiDeluxe <jmatuszewska00e@gmail.com>
Date: Mon, 30 Oct 2023 19:06:09 +0100
Subject: [PATCH] Regression test cache name change and strictier restore keys

---
 .github/workflows/main.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 629f4c0cc..4f5fa38ba 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,12 +29,11 @@ jobs:
           cache-name: cache-regression-tests
         with:
           path: test/external/riscv-tests/test-*
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{
-            hashFiles('**/riscv-tests/test-*') }}
+          key: ${{ env.cache-name }}-${{ runner.os }}-${{
+            job.container.id }}-${{ hashFiles('**/test/external/riscv-tests') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+            ${{ env.cache-name }}-${{ runner.os }}-${{ job.container.id }}-
+            ${{ env.cache-name }}-${{ runner.os }}-
 
       - if: ${{ steps.cache-regression.outputs.cache-hit != 'true' }}
         name: Build riscv-tests
@@ -49,6 +48,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: Set up Python
         uses: actions/setup-python@v4
@@ -71,13 +72,13 @@ jobs:
         env:
           cache-name: cache-regression-tests
         with:
+          submodules: recursive
           path: test/external/riscv-tests/test-*
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{
-            hashFiles('**/riscv-tests/test-*') }}
+          key: ${{ env.cache-name }}-${{ runner.os }}-${{
+            job.container.id }}-${{ hashFiles('**/test/external/riscv-tests') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+            ${{ env.cache-name }}-${{ runner.os }}-${{ job.container.id }}-
+            ${{ env.cache-name }}-${{ runner.os }}-
 
       - name: Run tests
         run: |