https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24dea07c3cc72c5480c2f12619cf96c49ef1e029
commit 24dea07c3cc72c5480c2f12619cf96c49ef1e029
Author: Serge Gautherie <32623169+sergegauthe...@users.noreply.github.com>
AuthorDate: Sat Feb 10 11:32:27 2024 +0100
Commit: GitHub <nore...@github.com>
CommitDate: Sat Feb 10 13:32:27 2024 +0300
[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-g f777e6bd and 0.4.15-dev-6472-g 732f223c.
---
.github/workflows/build.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6a58c3a7e4b..31c8af9fd33 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -53,9 +53,9 @@ jobs:
uses: actions/cache@v4
with:
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: |
- ccache-${{matrix.compiler}}-${{matrix.arch}}-
+
ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-
- name: Set ccache settings
run: |
echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV
@@ -133,7 +133,7 @@ jobs:
with:
path: src
- 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
run: cmake --build build -- -k0
- name: Generate ISOs
