From 45343588893cdb87c98f0e703028c5b039b8c2e8 Mon Sep 17 00:00:00 2001 From: Ivo Jimenez Date: Sun, 31 Oct 2021 18:05:20 -0700 Subject: [PATCH] gha: move ccache command invocation to container The host doesn't have ccache installed anymore Signed-off-by: Ivo Jimenez --- .github/workflows/redpanda-build.yml | 13 +++---------- build.sh | 10 +++++++++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/redpanda-build.yml b/.github/workflows/redpanda-build.yml index 59854f79aeb4..3b6ba703df1e 100644 --- a/.github/workflows/redpanda-build.yml +++ b/.github/workflows/redpanda-build.yml @@ -43,20 +43,13 @@ jobs: - name: build & test run: | - export CCACHE_COMPRESS=true - export CCACHE_COMPRESSLEVEL=6 - export CCACHE_MAXSIZE=200M - - ccache -p # print the config - ccache -s # print the stats before reusing - ccache -z # zero the stats - docker run --rm \ + -e CCACHE_COMPRESS=true \ + -e CCACHE_COMPRESSLEVEL=6 \ + -e CCACHE_MAXSIZE=200M \ --privileged \ --ipc=host \ -v $PWD:$PWD \ -w $PWD \ rp-toolchain \ ./build.sh - - ccache -s # print the stats after the build diff --git a/build.sh b/build.sh index 9f7380ce9b1a..3999474c78db 100755 --- a/build.sh +++ b/build.sh @@ -18,6 +18,10 @@ if [[ -z ${CCACHE_DIR} && -e /dev/shm ]]; then export CCACHE_DIR=/dev/shm/redpanda fi +ccache -p # print the config +ccache -s # print the stats before reusing +ccache -z # zero the stats + # Change Debug via -DCMAKE_BUILD_TYPE=Debug cmake -DCMAKE_BUILD_TYPE=Release \ -B$root/build \ @@ -28,4 +32,8 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DDEPOT_TOOLS_DIR=$DEPOT_TOOLS_DIR \ "$@" -(cd $root/build && ninja && ctest --output-on-failure -R _rpunit) +(cd $root/build && ninja) + +ccache -s # print the stats after the build + +(cd $root/build && ctest --output-on-failure -R _rpunit)