Skip to content

Commit 628606b

Browse files
authored
Merge pull request #1519 from AThousandShips/cache_improve
[CI] Upload build cache before running tests
2 parents 0a1e31f + 76b38de commit 628606b

File tree

3 files changed

+29
-7
lines changed

3 files changed

+29
-7
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: Setup Godot build cache
2-
description: Setup Godot build cache.
1+
name: Restore Godot build cache
2+
description: Restore Godot build cache.
33
inputs:
44
cache-name:
55
description: The cache base name (job name by default).
@@ -10,9 +10,8 @@ inputs:
1010
runs:
1111
using: "composite"
1212
steps:
13-
# Upload cache on completion and check it out now
14-
- name: Load .scons_cache directory
15-
uses: actions/cache@v3
13+
- name: Restore .scons_cache directory
14+
uses: actions/cache/restore@v3
1615
with:
1716
path: ${{inputs.scons-cache}}
1817
key: ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Save Godot build cache
2+
description: Save Godot build cache.
3+
inputs:
4+
cache-name:
5+
description: The cache base name (job name by default).
6+
default: "${{github.job}}"
7+
scons-cache:
8+
description: The SCons cache path.
9+
default: "${{github.workspace}}/.scons-cache/"
10+
runs:
11+
using: "composite"
12+
steps:
13+
- name: Save SCons cache directory
14+
uses: actions/cache/save@v4
15+
with:
16+
path: ${{inputs.scons-cache}}
17+
key: ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}

.github/workflows/ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ jobs:
9999
with:
100100
submodules: recursive
101101

102-
- name: Setup Godot build cache
103-
uses: ./.github/actions/godot-cache
102+
- name: Restore Godot build cache
103+
uses: ./.github/actions/godot-cache-restore
104104
with:
105105
cache-name: ${{ matrix.cache-name }}
106106
continue-on-error: true
@@ -153,6 +153,12 @@ jobs:
153153
cd test
154154
scons platform=${{ matrix.platform }} verbose=yes target=template_release ${{ matrix.flags }}
155155
156+
- name: Save Godot build cache
157+
uses: ./.github/actions/godot-cache-save
158+
with:
159+
cache-name: ${{ matrix.cache-name }}
160+
continue-on-error: true
161+
156162
- name: Download latest Godot artifacts
157163
uses: dsnopek/action-download-artifact@1322f74e2dac9feed2ee76a32d9ae1ca3b4cf4e9
158164
if: ${{ matrix.run-tests && env.GODOT_TEST_VERSION == 'master' }}

0 commit comments

Comments
 (0)