Merge pull request #40648 from RevoluPowered/github_actions_cache_fixes

GitHub actions cache fixes
This commit is contained in:
Rémi Verschelde 2020-07-24 07:30:26 +02:00 committed by GitHub
commit 422a2da8c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 35 deletions

View file

@ -3,7 +3,7 @@ on: [push, pull_request]
# Global Cache Settings
env:
SCONS_CACHE_LIMIT: 8192
SCONS_CACHE_LIMIT: 4096
jobs:
android-template:
@ -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

@ -3,7 +3,7 @@ on: [push, pull_request]
# Global Cache Settings
env:
SCONS_CACHE_LIMIT: 8192
SCONS_CACHE_LIMIT: 4096
EM_VERSION: latest
EM_CACHE_FOLDER: 'emsdk-cache'
@ -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

@ -3,7 +3,7 @@ on: [push, pull_request]
# Global Cache Settings
env:
SCONS_CACHE_LIMIT: 8192
SCONS_CACHE_LIMIT: 4096
jobs:
linux-editor:
@ -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

@ -3,7 +3,7 @@ on: [push, pull_request]
# Global Cache Settings
env:
SCONS_CACHE_LIMIT: 8192
SCONS_CACHE_LIMIT: 4096
jobs:
macos-editor:
@ -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

@ -5,7 +5,7 @@ on: [push, pull_request]
# SCONS_CACHE for windows must be set in the build environment
env:
SCONS_CACHE_MSVC_CONFIG: true
SCONS_CACHE_LIMIT: 8192
SCONS_CACHE_LIMIT: 4096
jobs:
windows-editor:
@ -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