mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 10:04:49 +00:00
[GITHUB] build.yml: Use all matrix values to restore Linux build cache (#5595)
Do not mix different build configurations. Extend cache key. Addendum to 0.4.15-dev-2996-gf777e6bd
and 0.4.15-dev-6472-g732f223c
.
This commit is contained in:
parent
b548b05e89
commit
24dea07c3c
1 changed files with 3 additions and 3 deletions
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
|
@ -53,9 +53,9 @@ jobs:
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ccache
|
path: ccache
|
||||||
key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
|
key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
ccache-${{matrix.compiler}}-${{matrix.arch}}-
|
ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-
|
||||||
- name: Set ccache settings
|
- name: Set ccache settings
|
||||||
run: |
|
run: |
|
||||||
echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV
|
echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV
|
||||||
|
@ -133,7 +133,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
path: src
|
path: src
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DDLL_EXPORT_VERSION=${{matrix.dllver}}
|
run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DDLL_EXPORT_VERSION=${{matrix.dllver}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1
|
||||||
- name: Build
|
- name: Build
|
||||||
run: cmake --build build -- -k0
|
run: cmake --build build -- -k0
|
||||||
- name: Generate ISOs
|
- name: Generate ISOs
|
||||||
|
|
Loading…
Reference in a new issue