From ff181cf346c663191dff78c2767629223a14137d Mon Sep 17 00:00:00 2001 From: bo0tzz <git@bo0tzz.me> Date: Thu, 8 May 2025 22:14:33 +0200 Subject: [PATCH] fix: always set cache-key-base during image build (#18168) --- .github/actions/image-build/action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/image-build/action.yml b/.github/actions/image-build/action.yml index 64a06ec141..276bbd22cf 100644 --- a/.github/actions/image-build/action.yml +++ b/.github/actions/image-build/action.yml @@ -66,13 +66,13 @@ runs: SUFFIX: ${{ steps.cache-key-suffix.outputs.suffix }} PLATFORM_PAIR: ${{ steps.prepare.outputs.platform-pair }} run: | + HASH=$(sha256sum <<< "${BUILD_ARGS}" | cut -d' ' -f1) + CACHE_KEY="${PLATFORM_PAIR}-${HASH}" + echo "cache-key-base=${CACHE_KEY}" >> $GITHUB_OUTPUT if [[ "${{ github.event.pull_request.head.repo.fork }}" == "true" ]]; then # Essentially just ignore the cache output (forks can't write to registry cache) echo "cache-to=type=local,dest=/tmp/discard,ignore-error=true" >> $GITHUB_OUTPUT else - HASH=$(sha256sum <<< "${BUILD_ARGS}" | cut -d' ' -f1) - CACHE_KEY="${PLATFORM_PAIR}-${HASH}" - echo "cache-key-base=${CACHE_KEY}" >> $GITHUB_OUTPUT echo "cache-to=type=registry,ref=${IMAGE}-build-cache:${CACHE_KEY}-${SUFFIX},mode=max,compression=zstd" >> $GITHUB_OUTPUT fi