mirror of
https://github.com/SerenityOS/serenity.git
synced 2025-01-22 09:21:57 -05:00
Meta: Make the jakt toolchain cache actually work
This commit is contained in:
parent
c6c6e6e2d8
commit
e098402e26
5 changed files with 18 additions and 2 deletions
8
.github/actions/cache-restore/action.yml
vendored
8
.github/actions/cache-restore/action.yml
vendored
|
@ -35,6 +35,10 @@ inputs:
|
|||
description: 'Path to the download cache directory'
|
||||
required: false
|
||||
default: 'caches'
|
||||
jakt_toolchain_cache_path:
|
||||
description: 'Path to the prebuilt jakt toolchain cache'
|
||||
required: false
|
||||
default: ''
|
||||
|
||||
outputs:
|
||||
serenity_ccache_primary_key:
|
||||
|
@ -103,8 +107,8 @@ runs:
|
|||
uses: actions/cache/restore@v4
|
||||
id: 'jakt-prebuilt'
|
||||
with:
|
||||
path: ${{ github.workspace }}/Toolchain/Local/jakt
|
||||
key: toolchain-${{ runner.os }}"-jakt-toolchain-${{ matrix.arch }}-${{ steps.toolchain-stamps.outputs.toolchain_stamp }}"
|
||||
path: ${{ inputs.jakt_toolchain_cache_path }}
|
||||
key: toolchain-${{ runner.os }}-jakt-toolchain-${{ matrix.arch }}-${{ steps.toolchain-stamps.outputs.toolchain_stamp }}
|
||||
|
||||
- name: 'Toolchain Compiler Cache'
|
||||
uses: actions/cache/restore@v4
|
||||
|
|
4
.github/actions/cache-save/action.yml
vendored
4
.github/actions/cache-save/action.yml
vendored
|
@ -43,6 +43,10 @@ inputs:
|
|||
description: 'Whether the jakt prebuilt cache was hit'
|
||||
required: false
|
||||
default: false
|
||||
jakt_prebuilt_path:
|
||||
description: 'Path to the prebuilt jakt toolchain'
|
||||
required: false
|
||||
default: ''
|
||||
|
||||
runs:
|
||||
using: "composite"
|
||||
|
|
2
.github/workflows/lagom-template.yml
vendored
2
.github/workflows/lagom-template.yml
vendored
|
@ -57,6 +57,7 @@ jobs:
|
|||
cache_key_extra: ${{ inputs.fuzzer }}
|
||||
serenity_ccache_path: ${{ env.CCACHE_DIR }}
|
||||
download_cache_path: ${{ github.workspace }}/Build/caches
|
||||
jakt_toolchain_cache_path: ${{ github.workspace }}/Toolchain/Local/jakt
|
||||
|
||||
- name: Assign Build Parameters
|
||||
id: 'build-parameters'
|
||||
|
@ -151,6 +152,7 @@ jobs:
|
|||
serenity_ccache_primary_key: ${{ steps.cache-restore.outputs.serenity_ccache_primary_key }}
|
||||
jakt_prebuilt_primary_key: ${{ steps.cache-restore.outputs.jakt_prebuilt_primary_key }}
|
||||
jakt_prebuilt_hit: ${{ steps.cache-restore.outputs.jakt_prebuilt_hit }}
|
||||
jakt_toolchain_cache_path: ${{ github.workspace }}/Toolchain/Local/jakt
|
||||
|
||||
# === TEST ===
|
||||
|
||||
|
|
2
.github/workflows/serenity-template.yml
vendored
2
.github/workflows/serenity-template.yml
vendored
|
@ -66,6 +66,7 @@ jobs:
|
|||
serenity_ccache_path: ${{ env.SERENITY_CCACHE_DIR }}
|
||||
toolchain_ccache_path: ${{ env.TOOLCHAIN_CCACHE_DIR }}
|
||||
download_cache_path: ${{ github.workspace }}/Build/caches
|
||||
jakt_toolchain_cache_path: ${{ github.workspace }}/Toolchain/Local/jakt
|
||||
|
||||
- name: Assign Build Parameters
|
||||
id: 'build-parameters'
|
||||
|
@ -148,6 +149,7 @@ jobs:
|
|||
toolchain_prebuilt_hit: ${{ steps.cache-restore.outputs.toolchain_prebuilt_hit }}
|
||||
jakt_prebuilt_primary_key: ${{ steps.cache-restore.outputs.jakt_prebuilt_primary_key }}
|
||||
jakt_prebuilt_hit: ${{ steps.cache-restore.outputs.jakt_prebuilt_hit }}
|
||||
jakt_toolchain_cache_path: ${{ github.workspace }}/Toolchain/Local/jakt
|
||||
|
||||
# === TEST ===
|
||||
|
||||
|
|
4
.github/workflows/wasm.yml
vendored
4
.github/workflows/wasm.yml
vendored
|
@ -44,6 +44,7 @@ jobs:
|
|||
cache_key_extra: 'WASM'
|
||||
serenity_ccache_path: ${{ env.SERENITY_CCACHE_DIR }}
|
||||
download_cache_path: ${{ github.workspace }}/Build/caches
|
||||
jakt_toolchain_cache_path: ${{ github.workspace }}/Toolchain/Local/jakt
|
||||
|
||||
- name: "Build host lagom tools"
|
||||
run: |
|
||||
|
@ -84,6 +85,9 @@ jobs:
|
|||
arch: 'Lagom'
|
||||
serenity_ccache_path: ${{ env.SERENITY_CCACHE_DIR }}
|
||||
serenity_ccache_primary_key: ${{ steps.cache-restore.outputs.serenity_ccache_primary_key }}
|
||||
jakt_prebuilt_primary_key: ${{ steps.cache-restore.outputs.jakt_prebuilt_primary_key }}
|
||||
jakt_prebuilt_hit: ${{ steps.cache-restore.outputs.jakt_prebuilt_hit }}
|
||||
jakt_toolchain_cache_path: ${{ github.workspace }}/Toolchain/Local/jakt
|
||||
|
||||
- name: "Prepare files"
|
||||
run: |
|
||||
|
|
Loading…
Reference in a new issue