Fix regression tests failing due to invalid cache being restored (#1104)

This commit is contained in:
Robert Lewicki
2022-11-01 14:27:40 +01:00
committed by GitHub
parent 1a9fc964df
commit f6d218ed36

View File

@@ -60,7 +60,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: test path: test
key: ${{ hashFiles('test/fetch-test-deps.sh') }} key: ${{ matrix.os }}-${{ hashFiles('test/fetch-test-deps.sh') }}
- if: ${{ steps.test-deps-cache.outputs.cache-hit != 'true' }} - if: ${{ steps.test-deps-cache.outputs.cache-hit != 'true' }}
name: Fetch test dependency repositories name: Fetch test dependency repositories
continue-on-error: true continue-on-error: true
@@ -132,7 +132,10 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: test path: test
key: ${{ hashFiles('test/fetch-test-deps.sh') }} # Intentionally using matrix.bits instead matrix.arch as it's fine to share a cache
# with a different job below that also runs on Windows but doesn't have arch property
# defined.
key: ${{ matrix.os }}-${{ matrix.bits }}-${{ hashFiles('test/fetch-test-deps.sh') }}
- if: ${{ steps.test-deps-cache.outputs.cache-hit != 'true' }} - if: ${{ steps.test-deps-cache.outputs.cache-hit != 'true' }}
name: Fetch test dependency repositories name: Fetch test dependency repositories
shell: bash shell: bash
@@ -226,7 +229,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: test path: test
key: ${{ hashFiles('test/fetch-test-deps.sh') }} key: ${{ matrix.os }}-${{ matrix.bits }}-${{ hashFiles('test/fetch-test-deps.sh') }}
- if: ${{ steps.test-deps-cache.outputs.cache-hit != 'true' }} - if: ${{ steps.test-deps-cache.outputs.cache-hit != 'true' }}
name: Fetch test dependency repositories name: Fetch test dependency repositories
shell: bash shell: bash