From bf5c8dcb278b2e43e28dbe35236215d03a4bc051 Mon Sep 17 00:00:00 2001 From: Valentin Volkl Date: Fri, 28 Feb 2025 11:48:23 +0100 Subject: [PATCH 1/3] Add arch to apt cache --- action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/action.yml b/action.yml index 3ed2149..1663414 100644 --- a/action.yml +++ b/action.yml @@ -340,6 +340,7 @@ runs: echo "codename=${DISTRIB_CODENAME}" >> $GITHUB_OUTPUT echo "description=${DISTRIB_DESCRIPTION}" >> $GITHUB_OUTPUT echo "id-release=${DISTRIB_ID}-${DISTRIB_DESCRIPTION}" >> $GITHUB_OUTPUT + echo "arch=$(uname -m)" >> $GITHUB_OUTPUT elif [ "$RUNNER_OS" == "macOS" ]; then echo "id-release=macOS-$(sw_vers -productVersion)" >> $GITHUB_OUTPUT fi From 2bb446ef8d4d135d52ede538cc418d9b74230f78 Mon Sep 17 00:00:00 2001 From: Valentin Volkl Date: Fri, 28 Feb 2025 15:55:55 +0100 Subject: [PATCH 2/3] add arch to key --- action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 1663414..16b3c6b 100644 --- a/action.yml +++ b/action.yml @@ -343,11 +343,12 @@ runs: echo "arch=$(uname -m)" >> $GITHUB_OUTPUT elif [ "$RUNNER_OS" == "macOS" ]; then echo "id-release=macOS-$(sw_vers -productVersion)" >> $GITHUB_OUTPUT + echo "arch=$(uname -m)" >> $GITHUB_OUTPUT fi shell: bash - uses: actions/cache@v4 with: - key: cvmfs-apt-cache-${{ steps.lsb-release.outputs.id-release }}-${{ hashFiles('action.yml') }} + key: cvmfs-apt-cache-${{ steps.lsb-release.outputs.id-release }}-${{ steps.lsb-release.outputs.id-release }}-${{ hashFiles('action.yml') }} path: | ${{ inputs.apt_cache }} - run: | From 81999eef8fb90e2d146c57574f724c9f5d5b41b1 Mon Sep 17 00:00:00 2001 From: Valentin Volkl Date: Fri, 28 Feb 2025 17:22:23 +0100 Subject: [PATCH 3/3] Update action.yml Co-authored-by: ocaisa --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 16b3c6b..46dc163 100644 --- a/action.yml +++ b/action.yml @@ -348,7 +348,7 @@ runs: shell: bash - uses: actions/cache@v4 with: - key: cvmfs-apt-cache-${{ steps.lsb-release.outputs.id-release }}-${{ steps.lsb-release.outputs.id-release }}-${{ hashFiles('action.yml') }} + key: cvmfs-apt-cache-${{ steps.lsb-release.outputs.id-release }}-${{ steps.lsb-release.outputs.arch }}-${{ hashFiles('action.yml') }} path: | ${{ inputs.apt_cache }} - run: |