Improve the cache keys to prevent clashes for the wrong type of build

This commit is contained in:
Gordon MacPherson 2020-07-24 00:15:23 +01:00
parent 3c07d0ff32
commit afdce1e30c
5 changed files with 31 additions and 30 deletions

View File

@ -43,11 +43,11 @@ jobs:
uses: actions/cache@v2
with:
path: ${{github.workspace}}/.scons_cache/
key: ${{runner.os}}-template-${{github.sha}}
key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
restore-keys: |
${{runner.os}}-template-${{github.sha}}
${{runner.os}}-template
${{runner.os}}
${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
${{github.job}}-${GITHUB_REF##*/}
${{github.job}}
# Use python 3.x release (works cross platform)
- name: Set up Python 3.x

View File

@ -29,9 +29,10 @@ jobs:
uses: actions/cache@v2
with:
path: ${{github.workspace}}/.scons_cache/
key: ${{github.job}}-${{github.sha}}
key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
restore-keys: |
${{github.job}}-${{github.sha}}
${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
${{github.job}}-${GITHUB_REF##*/}
${{github.job}}
# Additional cache for Emscripten generated system libraries

View File

@ -33,11 +33,11 @@ jobs:
uses: actions/cache@v2
with:
path: ${{github.workspace}}/.scons_cache/
key: ${{runner.os}}-editor-${{github.sha}}
key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
restore-keys: |
${{runner.os}}-editor-${{github.sha}}
${{runner.os}}-editor
${{runner.os}}
${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
${{github.job}}-${GITHUB_REF##*/}
${{github.job}}
# Use python 3.x release (works cross platform; best to keep self contained in it's own step)
- name: Set up Python 3.x
@ -90,11 +90,11 @@ jobs:
uses: actions/cache@v2
with:
path: ${{github.workspace}}/.scons_cache/
key: ${{runner.os}}-template-${{github.sha}}
key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
restore-keys: |
${{runner.os}}-template-${{github.sha}}
${{runner.os}}-template
${{runner.os}}
${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
${{github.job}}-${GITHUB_REF##*/}
${{github.job}}
# Use python 3.x release (works cross platform)
- name: Set up Python 3.x

View File

@ -22,11 +22,11 @@ jobs:
uses: actions/cache@v2
with:
path: ${{github.workspace}}/.scons_cache/
key: ${{runner.os}}-editor-${{github.sha}}
key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
restore-keys: |
${{runner.os}}-editor-${{github.sha}}
${{runner.os}}-editor
${{runner.os}}
${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
${{github.job}}-${GITHUB_REF##*/}
${{github.job}}
# Use python 3.x release (works cross platform; best to keep self contained in it's own step)
- name: Set up Python 3.x
@ -67,11 +67,11 @@ jobs:
uses: actions/cache@v2
with:
path: ${{github.workspace}}/.scons_cache/
key: ${{runner.os}}-template-${{github.sha}}
key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
restore-keys: |
${{runner.os}}-template-${{github.sha}}
${{runner.os}}-template
${{runner.os}}
${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
${{github.job}}-${GITHUB_REF##*/}
${{github.job}}
# Use python 3.x release (works cross platform)
- name: Set up Python 3.x

View File

@ -26,11 +26,11 @@ jobs:
uses: RevoluPowered/cache@v2.1
with:
path: /.scons_cache/
key: ${{runner.os}}-editor-${{github.sha}}
key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
restore-keys: |
${{runner.os}}-editor-${{github.sha}}
${{runner.os}}-editor
${{runner.os}}
${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
${{github.job}}-${GITHUB_REF##*/}
${{github.job}}
# Use python 3.x release (works cross platform; best to keep self contained in it's own step)
- name: Set up Python 3.x
@ -80,11 +80,11 @@ jobs:
uses: RevoluPowered/cache@v2.1
with:
path: /.scons_cache/
key: ${{runner.os}}-template-${{github.sha}}
key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
restore-keys: |
${{runner.os}}-template-${{github.sha}}
${{runner.os}}-template
${{runner.os}}
${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
${{github.job}}-${GITHUB_REF##*/}
${{github.job}}
# Use python 3.x release (works cross platform)
- name: Set up Python 3.x