From d7e2468e13fb871026e1969845a1c5ccb9a1dcee Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Sun, 28 May 2023 03:12:54 +0200 Subject: [PATCH] CI: build: add option to define custom ccache cache type Add new input to define custom ccache cache type. This is useful to use a different ccache cache for some special workflow that may do more test than simple kernel compilation. Signed-off-by: Christian Marangi (cherry picked from commit 07b52a8a25f261e3cee03f4980e4bc868e9ee5cc) --- .github/workflows/build.yml | 7 +++++-- .github/workflows/packages.yml | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 27ed5cc218..0fbeb5b0f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,6 +57,9 @@ on: use_ccache_cache: type: boolean default: true + ccache_type: + type: string + default: kernel permissions: contents: read @@ -257,9 +260,9 @@ jobs: uses: actions/cache/restore@v3 with: path: openwrt/.ccache - key: ccache-kernel-${{ inputs.target }}/${{ inputs.subtarget }}-${{ hashFiles('openwrt/include/kernel-**') }} + key: ccache-${{ inputs.ccache_type }}-${{ inputs.target }}/${{ inputs.subtarget }}-${{ hashFiles('openwrt/include/kernel-**') }} restore-keys: | - ccache-kernel-${{ inputs.target }}/${{ inputs.subtarget }}- + ccache-${{ inputs.ccache_type }}-${{ inputs.target }}/${{ inputs.subtarget }}- - name: Download external toolchain/sdk if: inputs.build_toolchain == false && steps.parse-toolchain.outputs.toolchain-type != 'internal' && steps.parse-toolchain.outputs.toolchain-type != 'external_container' diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 8ab07f1f07..58bbcd0131 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -53,4 +53,5 @@ jobs: build_all_kmods: true build_all_modules: true build_full: true + ccache_type: packages -- 2.30.2