From 0223c009ac4413befd1f37591886080997d2926c Mon Sep 17 00:00:00 2001 From: JumiDeluxe Date: Mon, 30 Oct 2023 19:06:09 +0100 Subject: [PATCH] Regression test cache name change and strictier restore keys --- .github/workflows/main.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 629f4c0cc..779bd2d6b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,18 +23,17 @@ jobs: submodules: recursive - name: Cache regression-tests - id: cache-regression + id: regression-tests uses: actions/cache@v3 env: 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('**/riscv-tests/test-*') }} restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- + ${{ env.cache-name }}-${{ runner.os }}-${{ + job.container.id }} - if: ${{ steps.cache-regression.outputs.cache-hit != 'true' }} name: Build riscv-tests @@ -72,12 +71,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('**/riscv-tests/test-*') }} restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- + ${{ env.cache-name }}-${{ runner.os }}-${{ + job.container.id }} - name: Run tests run: |