From 3cd291b98fbf781a3c634197dabe638420166101 Mon Sep 17 00:00:00 2001
From: ocaisa <alan.ocais@cecam.org>
Date: Thu, 22 May 2025 09:27:19 +0200
Subject: [PATCH 1/4] Make cache key reproducible for other repositories

Existing cache key includes spaces due to use of `description` from `lsb-release` and relies on hashing a file (`action.yml`) that is unlikely to exist for repositories using the action
---
 action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index 7b4551b..54e9a59 100644
--- a/action.yml
+++ b/action.yml
@@ -339,7 +339,7 @@ runs:
           echo "release=${DISTRIB_RELEASE}" >> $GITHUB_OUTPUT
           echo "codename=${DISTRIB_CODENAME}" >> $GITHUB_OUTPUT
           echo "description=${DISTRIB_DESCRIPTION}" >> $GITHUB_OUTPUT
-          echo "id-release=${DISTRIB_ID}-${DISTRIB_DESCRIPTION}" >> $GITHUB_OUTPUT
+          echo "id-release=${DISTRIB_ID}-${DISTRIB_RELEASE}" >> $GITHUB_OUTPUT
           echo "arch=$(uname -m)" >> $GITHUB_OUTPUT
         elif [ "$RUNNER_OS" == "macOS" ]; then
           echo "id-release=macOS-$(sw_vers -productVersion)" >> $GITHUB_OUTPUT
@@ -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.arch }}-${{ hashFiles('action.yml') }}
+        key: cvmfs-apt-cache-${{ steps.lsb-release.outputs.id-release }}-${{ steps.lsb-release.outputs.arch }}
         path: |
           ${{ inputs.apt_cache }}
     - run: |

From 994a24ccc9153ac268d0d870b51ec0af7a8838cb Mon Sep 17 00:00:00 2001
From: ocaisa <alan.ocais@cecam.org>
Date: Thu, 22 May 2025 10:09:19 +0200
Subject: [PATCH 2/4] Update action.yml

---
 action.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 54e9a59..aede0c0 100644
--- a/action.yml
+++ b/action.yml
@@ -345,10 +345,15 @@ runs:
           echo "id-release=macOS-$(sw_vers -productVersion)" >> $GITHUB_OUTPUT
           echo "arch=$(uname -m)" >> $GITHUB_OUTPUT
         fi
+        # Create an envvar that stores information about the action version used
+        ACTION_VERSION=$(basename "$GITHUB_ACTION_PATH")
+        ACTION_NAME=$(basename $(dirname "$GITHUB_ACTION_PATH"))
+        ACTION_OWNER=$(basename $(dirname $(dirname "$GITHUB_ACTION_PATH")))
+        echo "cvmfs_action_version=$ACTION_OWNER_$ACTION_NAME_$ACTION_VERSION" >> $GITHUB_ENV
       shell: bash
     - uses: actions/cache@v4
       with:
-        key: cvmfs-apt-cache-${{ steps.lsb-release.outputs.id-release }}-${{ steps.lsb-release.outputs.arch }}
+        key: cvmfs-apt-cache-${{ steps.lsb-release.outputs.id-release }}-${{ steps.lsb-release.outputs.arch }}-${{ steps.lsb-release.outputs.cvmfs_action_version }}
         path: |
           ${{ inputs.apt_cache }}
     - run: |

From c4a951db239043c0d77b7e1a6ae83ce71ef80d97 Mon Sep 17 00:00:00 2001
From: ocaisa <alan.ocais@cecam.org>
Date: Thu, 22 May 2025 10:11:42 +0200
Subject: [PATCH 3/4] Update action.yml

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index aede0c0..943b74b 100644
--- a/action.yml
+++ b/action.yml
@@ -349,7 +349,7 @@ runs:
         ACTION_VERSION=$(basename "$GITHUB_ACTION_PATH")
         ACTION_NAME=$(basename $(dirname "$GITHUB_ACTION_PATH"))
         ACTION_OWNER=$(basename $(dirname $(dirname "$GITHUB_ACTION_PATH")))
-        echo "cvmfs_action_version=$ACTION_OWNER_$ACTION_NAME_$ACTION_VERSION" >> $GITHUB_ENV
+        echo "cvmfs_action_version=$ACTION_OWNER_$ACTION_NAME_$ACTION_VERSION" >> $GITHUB_OUTPUT
       shell: bash
     - uses: actions/cache@v4
       with:

From 987d52a1a6c90e0a3304453c3f606fa45f376bd0 Mon Sep 17 00:00:00 2001
From: ocaisa <alan.ocais@cecam.org>
Date: Thu, 22 May 2025 10:27:07 +0200
Subject: [PATCH 4/4] Update action.yml

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 943b74b..1e3e99f 100644
--- a/action.yml
+++ b/action.yml
@@ -349,7 +349,7 @@ runs:
         ACTION_VERSION=$(basename "$GITHUB_ACTION_PATH")
         ACTION_NAME=$(basename $(dirname "$GITHUB_ACTION_PATH"))
         ACTION_OWNER=$(basename $(dirname $(dirname "$GITHUB_ACTION_PATH")))
-        echo "cvmfs_action_version=$ACTION_OWNER_$ACTION_NAME_$ACTION_VERSION" >> $GITHUB_OUTPUT
+        echo "cvmfs_action_version=${ACTION_OWNER}_${ACTION_NAME}_${ACTION_VERSION}" >> $GITHUB_OUTPUT
       shell: bash
     - uses: actions/cache@v4
       with: