From f29495838aa619bc279f4feeb96f09ea5ffe88f3 Mon Sep 17 00:00:00 2001 From: Dennis Brakhane Date: Thu, 18 Jul 2024 19:26:30 +0200 Subject: [PATCH] actions: don't use ccache direct mode (#892) Conditional inclusion based on what files are available is the one edge case that doesn't work in direct mode. --- .github/workflows/build-nightly.yml | 4 ++-- .github/workflows/build-pr.yml | 4 ++-- .github/workflows/build.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml index 74436f9e1..c097ece24 100644 --- a/.github/workflows/build-nightly.yml +++ b/.github/workflows/build-nightly.yml @@ -63,14 +63,14 @@ jobs: mkdir build cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - make -j$(nproc) + CCACHE_NODIRECT=1 make -j$(nproc) echo "---Generating Shader Dump---" cd WickedEngine ./offlineshadercompiler spirv rebuild shaderdump mv wiShaderDump.h ../../WickedEngine/ cd .. echo "---Rebuilding with ShaderDump---" - make -B -j $(nproc) + CCACHE_NODIRECT=1 make -B -j $(nproc) - name: Move files run: | diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 0c73350f2..25f1a1dc2 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -62,14 +62,14 @@ jobs: mkdir build cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - make -j$(nproc) + CCACHE_NODIRECT=1 make -j$(nproc) echo "---Generating Shader Dump---" cd WickedEngine ./offlineshadercompiler spirv rebuild shaderdump mv wiShaderDump.h ../../WickedEngine/ cd .. echo "---Rebuilding with ShaderDump---" - make -B -j $(nproc) + CCACHE_NODIRECT=1 make -B -j $(nproc) - name: Move binaries diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9603bac38..adcc1d9fc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,14 +64,14 @@ jobs: mkdir build cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - make -j$(nproc) + CCACHE_NODIRECT=1 make -j$(nproc) echo "---Generating Shader Dump---" cd WickedEngine ./offlineshadercompiler spirv rebuild shaderdump mv wiShaderDump.h ../../WickedEngine/ cd .. echo "---Rebuilding with ShaderDump---" - make -B -j $(nproc) + CCACHE_NODIRECT=1 make -B -j $(nproc) - name: Move files