diff options
| author | David Snopek <dsnopek@gmail.com> | 2024-07-24 09:05:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-24 09:05:48 -0500 |
| commit | 628606b28b1be7760bb2a9a19796446629515e59 (patch) | |
| tree | 115044db351a5b9d7c999cbedc589be291de78c0 | |
| parent | 0a1e31fa459b2d3e1b5f3a56823740f86a2fe02a (diff) | |
| parent | 76b38de01a31c5c1762c4b8239e7a51ebea84bef (diff) | |
| download | redot-cpp-628606b28b1be7760bb2a9a19796446629515e59.tar.gz | |
Merge pull request #1519 from AThousandShips/cache_improve
[CI] Upload build cache before running tests
| -rw-r--r-- | .github/actions/godot-cache-restore/action.yml (renamed from .github/actions/godot-cache/action.yml) | 9 | ||||
| -rw-r--r-- | .github/actions/godot-cache-save/action.yml | 17 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 10 |
3 files changed, 29 insertions, 7 deletions
diff --git a/.github/actions/godot-cache/action.yml b/.github/actions/godot-cache-restore/action.yml index 2d7afc8..5df5776 100644 --- a/.github/actions/godot-cache/action.yml +++ b/.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}} diff --git a/.github/actions/godot-cache-save/action.yml b/.github/actions/godot-cache-save/action.yml new file mode 100644 index 0000000..b7cbf91 --- /dev/null +++ b/.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}} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4471fa..76abdd5 100644 --- a/.github/workflows/ci.yml +++ b/.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' }} |