diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1890910480..6298467a83 100644 --- 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 index eef0e09768..2e5fbaed36 160000 --- a/verif/core-v-verif +++ b/verif/core-v-verif @@ -1 +1 @@ -Subproject commit eef0e097685f095b77b469b920059d38471434b6 +Subproject commit 2e5fbaed368aa25e5bfc2a5502457f430fb95e7d