From 29e82243ecd69becf4298a60d5e1aa3a70213416 Mon Sep 17 00:00:00 2001 From: Geza Lore Date: Sat, 21 Oct 2023 12:03:05 +0100 Subject: [PATCH] ci: Set CCACHE_SLOPPINESS as required for using PCH While the solution of setting CCACHE_SLOPPINESS in the makefiles seems to work locally, the CI has been reporting high miss rates since the PCH patch landed. Possibly the CI environment has CCACHE_SLOPPINESS set to the empty string, which prevents Make ?= to apply. --- .github/workflows/build.yml | 2 ++ ci/ci-script.bash | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee8fc916291..8142ec6d88f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,8 @@ env: CCACHE_COMPRESS: 1 CCACHE_DIR: ${{ github.workspace }}/.ccache CCACHE_LIMIT_MULTIPLE: 0.95 + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_LOGFILE: ccache.log defaults: run: diff --git a/ci/ci-script.bash b/ci/ci-script.bash index 225c9b50c35..5b13e0e9d6e 100755 --- a/ci/ci-script.bash +++ b/ci/ci-script.bash @@ -48,8 +48,10 @@ if [ "$CI_BUILD_STAGE_NAME" = "build" ]; then autoconf ./configure --enable-longtests --enable-ccwarn ${CI_M32:+--enable-m32} ccache -z + ccache -p "$MAKE" -j "$NPROC" -k ccache -s + cat ccache.log if [ "$CI_OS_NAME" = "osx" ]; then file bin/verilator_bin file bin/verilator_bin_dbg