Fix Github CI by changing riscv-isa-sim hash (#2190)

This commit is contained in:
MarioOpenHWGroup 2024-06-04 12:33:21 +02:00 committed by GitHub
parent a5152b03a5
commit 721fa0c175
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions

View file

@ -42,7 +42,9 @@ 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/vendor/riscv/') }}
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('verif/regress/install-spike.sh',
'verif/core-v-verif/vendor/riscv/riscv-isa-sim/**/*',
'verif/core-v-verif/vendor/riscv/riscv-isa-sim/*') }}
- name: Prepare
run: |
@ -95,7 +97,9 @@ 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/vendor/riscv/') }}
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('verif/regress/install-spike.sh',
'verif/core-v-verif/vendor/riscv/riscv-isa-sim/**/*',
'verif/core-v-verif/vendor/riscv/riscv-isa-sim/*') }}
- name: Run Tests
run: |
@ -155,7 +159,9 @@ 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/vendor/riscv/') }}
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('verif/regress/install-spike.sh',
'verif/core-v-verif/vendor/riscv/riscv-isa-sim/**/*',
'verif/core-v-verif/vendor/riscv/riscv-isa-sim/*') }}
- name: Run Tests
run: |

View file

@ -21,7 +21,7 @@ if [ -d ${VERILATOR_BUILD_DIR} ]; then
fi
if [ -f ${SPIKE_PATH}/spike ]; then
spike_version="$(git -C ${SPIKE_SRC_DIR} log -1 --pretty=tformat:%h -- ${SPIKE_SRC_DIR}/ )"
spike_version="$(git -C ${SPIKE_SRC_DIR} log -1 --pretty=tformat:%h )"
spike_installed_version="$(${SPIKE_PATH}/spike -v |& cut -d ' ' -f 2)"
if [ "$spike_installed_version" != "$spike_version" ]; then
rm -rf ${SPIKE_INSTALL_DIR}