diff options
Diffstat (limited to '.github/workflows/macos_builds.yml')
| -rw-r--r-- | .github/workflows/macos_builds.yml | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml index b896732ffc..f6d357e706 100644 --- a/.github/workflows/macos_builds.yml +++ b/.github/workflows/macos_builds.yml @@ -3,6 +3,7 @@ on: [push, pull_request] # Global Cache Settings env: + GODOT_BASE_BRANCH: master SCONS_CACHE_LIMIT: 4096 jobs: @@ -15,18 +16,16 @@ jobs: - uses: actions/checkout@v2 # Upload cache on completion and check it out now - # Editing this is pretty dangerous for windows since it can break and needs properly tested with a fresh cache. - # Linux with this will work reliably, so not as bad to edit for Linux. - name: Load .scons_cache directory id: macos-editor-cache uses: actions/cache@v2 with: path: ${{github.workspace}}/.scons_cache/ - key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}} + key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}} restore-keys: | - ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}} - ${{github.job}}-${GITHUB_REF##*/} - ${{github.job}} + ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}} + ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}} + ${{github.job}}-${{env.GODOT_BASE_BRANCH}} # Use python 3.x release (works cross platform; best to keep self contained in it's own step) - name: Set up Python 3.x @@ -60,18 +59,16 @@ jobs: - uses: actions/checkout@v2 # Upload cache on completion and check it out now - # Editing this is pretty dangerous for windows since it can break and needs properly tested with a fresh cache. - # Linux with this will work reliably, so not as bad to edit for Linux. - name: Load .scons_cache directory id: macos-template-cache uses: actions/cache@v2 with: path: ${{github.workspace}}/.scons_cache/ - key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}} + key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}} restore-keys: | - ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}} - ${{github.job}}-${GITHUB_REF##*/} - ${{github.job}} + ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}} + ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}} + ${{github.job}}-${{env.GODOT_BASE_BRANCH}} # Use python 3.x release (works cross platform) - name: Set up Python 3.x @@ -89,6 +86,7 @@ jobs: python -m pip install scons python --version scons --version + - name: Compilation env: SCONS_CACHE: ${{github.workspace}}/.scons_cache/ |