From c93692a779674fa2a458dbeaf41164a2d7262552 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Wed, 18 Aug 2021 22:19:26 -0500 Subject: [PATCH] GHActions:Linux: Make ccache config global New testing step was missing the config --- .github/workflows/linux-workflow.yml | 7 +++++++ .github/workflows/scripts/linux/compile.sh | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linux-workflow.yml b/.github/workflows/linux-workflow.yml index 87311312bf..85d15d0161 100644 --- a/.github/workflows/linux-workflow.yml +++ b/.github/workflows/linux-workflow.yml @@ -104,6 +104,13 @@ jobs: # Set some sort of timeout in the event of run-away builds. We are limited on concurrent jobs so, get rid of them. timeout-minutes: 30 + env: + CCACHE_BASEDIR: ${{ github.workspace }} + CCACHE_DIR: ${{ github.workspace }}/.ccache + CCACHE_COMPRESS: true + CCACHE_COMPRESSLEVEL: 9 + CCACHE_MAXSIZE: 100M + steps: # NOTE - useful for debugging # - name: Dump GitHub context diff --git a/.github/workflows/scripts/linux/compile.sh b/.github/workflows/scripts/linux/compile.sh index 4a72016161..ae29d171a0 100755 --- a/.github/workflows/scripts/linux/compile.sh +++ b/.github/workflows/scripts/linux/compile.sh @@ -6,12 +6,6 @@ if [ -n "${GITHUB_ACTIONS}" ]; then echo "Warning: Running this script outside of GitHub Actions isn't recommended." fi -export CCACHE_BASEDIR=${GITHUB_WORKSPACE} -export CCACHE_DIR=${GITHUB_WORKSPACE}/.ccache -export CCACHE_COMPRESS="true" -export CCACHE_COMPRESSLEVEL="6" -export CCACHE_MAXSIZE="400M" - # Prepare the Cache ccache -p ccache -z