ci: use generic WAFCACHE_VERBOSITY env var rather than calling --zone…

…s= to debug. Set WAFCACHE to ~/wafcache
FWGS · Nov 17, 2024 · f0a2433 · f0a2433
1 parent ed39493
commit f0a2433
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -52,6 +52,8 @@ jobs:
     env:
       SDL_VERSION: 2.30.3
       GH_CPU_ARCH: ${{ matrix.targetarch }}
+      WAFCACHE: $HOME/wafcache
+      WAFCACHE_VERBOSITY: 1
       WAFCACHE_EVICT_MAX_BYTES: 1000000 # github only gives 10gb for the whole repository
       WAFCACHE_STATS: 1 # enable statistics in build log
     steps:
@@ -63,8 +65,7 @@ jobs:
       uses: actions/cache@v3
       with:
         key: ${{ runner.os }}-${{ matrix.targetos }}-${{ matrix.targetarch }}
-        path: |
-          ~/.cache/wafcache*
+        path: ~/wafcache
     - name: Install dependencies
       run: bash scripts/gha/deps_${{ matrix.targetos }}.sh
     - name: Build engine

diff --git a/scripts/gha/build_psvita.sh b/scripts/gha/build_psvita.sh
@@ -45,7 +45,7 @@ popd
 echo "Building engine..."
 
 ./waf configure -T release --psvita --enable-wafcache || die_configure
-./waf build install --destdir=pkgtemp/data/xash3d --zones=wafcache || die
+./waf build install --destdir=pkgtemp/data/xash3d || die
 cp build/engine/xash.vpk pkgtemp/
 
 echo "Building HLSDK..."