Merge pull request #1519 from AThousandShips/cache_improve

[CI] Upload build cache before running tests

Author: dsnopek

.github/actions/godot-cache/action.yml renamed to .github/actions/godot-cache-restore/action.yml

@@ -1,5 +1,5 @@
-name: Setup Godot build cache
-description: Setup Godot build cache.
+name: Restore Godot build cache
+description: Restore Godot build cache.
 inputs:
  cache-name:
  description: The cache base name (job name by default).
@@ -10,9 +10,8 @@ inputs:
 runs:
  using: "composite"
  steps:
- # Upload cache on completion and check it out now
- - name: Load .scons_cache directory
- uses: actions/cache@v3
+ - name: Restore .scons_cache directory
+ uses: actions/cache/restore@v3
  with:
  path: ${{inputs.scons-cache}}
  key: ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}

.github/actions/godot-cache-save/action.yml

@@ -0,0 +1,17 @@
+name: Save Godot build cache
+description: Save Godot build cache.
+inputs:
+ cache-name:
+ description: The cache base name (job name by default).
+ default: "${{github.job}}"
+ scons-cache:
+ description: The SCons cache path.
+ default: "${{github.workspace}}/.scons-cache/"
+runs:
+ using: "composite"
+ steps:
+ - name: Save SCons cache directory
+ uses: actions/cache/save@v4
+ with:
+ path: ${{inputs.scons-cache}}
+ key: ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}

.github/workflows/ci.yml

@@ -99,8 +99,8 @@ jobs:
  with:
  submodules: recursive
 
- - name: Setup Godot build cache
- uses: ./.github/actions/godot-cache
+ - name: Restore Godot build cache
+ uses: ./.github/actions/godot-cache-restore
  with:
  cache-name: ${{ matrix.cache-name }}
  continue-on-error: true
@@ -153,6 +153,12 @@ jobs:
  cd test
  scons platform=${{ matrix.platform }} verbose=yes target=template_release ${{ matrix.flags }}
 
+ - name: Save Godot build cache
+ uses: ./.github/actions/godot-cache-save
+ with:
+ cache-name: ${{ matrix.cache-name }}
+ continue-on-error: true
+
  - name: Download latest Godot artifacts
  uses: dsnopek/action-download-artifact@1322f74e2dac9feed2ee76a32d9ae1ca3b4cf4e9
  if: ${{ matrix.run-tests && env.GODOT_TEST_VERSION == 'master' }}