From e3d2ea5ff3caa7cd667db7c002c73af49e25d0c3 Mon Sep 17 00:00:00 2001
From: Kevin Stillhammer <kevin.stillhammer@gmail.com>
Date: Fri, 23 May 2025 09:43:52 +0200
Subject: [PATCH] Purge cache in cache key (#423)

Fixes: #416
---
 dist/save-cache/index.js   | 8 +++-----
 dist/setup/index.js        | 8 +++-----
 src/cache/restore-cache.ts | 4 +++-
 src/utils/inputs.ts        | 6 +-----
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/dist/save-cache/index.js b/dist/save-cache/index.js
index 2147ccc..f84ed2f 100644
--- a/dist/save-cache/index.js
+++ b/dist/save-cache/index.js
@@ -88715,7 +88715,8 @@ async function computeKeys() {
     const suffix = inputs_1.cacheSuffix ? `-${inputs_1.cacheSuffix}` : "";
     const pythonVersion = await getPythonVersion();
     const platform = await (0, platforms_1.getPlatform)();
-    return `setup-uv-${CACHE_VERSION}-${(0, platforms_1.getArch)()}-${platform}-${pythonVersion}${cacheDependencyPathHash}${suffix}`;
+    const pruned = inputs_1.pruneCache ? "-pruned" : "";
+    return `setup-uv-${CACHE_VERSION}-${(0, platforms_1.getArch)()}-${platform}-${pythonVersion}${pruned}${cacheDependencyPathHash}${suffix}`;
 }
 async function getPythonVersion() {
     if (inputs_1.pythonVersion !== "") {
@@ -89014,7 +89015,7 @@ exports.ignoreNothingToCache = core.getInput("ignore-nothing-to-cache") === "tru
 exports.ignoreEmptyWorkdir = core.getInput("ignore-empty-workdir") === "true";
 exports.toolBinDir = getToolBinDir();
 exports.toolDir = getToolDir();
-exports.serverUrl = getServerUrl();
+exports.serverUrl = core.getInput("server-url");
 exports.githubToken = core.getInput("github-token");
 function getEnableCache() {
     const enableCacheInput = core.getInput("enable-cache");
@@ -89071,9 +89072,6 @@ function expandTilde(input) {
     }
     return input;
 }
-function getServerUrl() {
-    return core.getInput("server-url");
-}
 
 
 /***/ }),
diff --git a/dist/setup/index.js b/dist/setup/index.js
index 4a60b8d..e62119b 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -121046,7 +121046,8 @@ async function computeKeys() {
     const suffix = inputs_1.cacheSuffix ? `-${inputs_1.cacheSuffix}` : "";
     const pythonVersion = await getPythonVersion();
     const platform = await (0, platforms_1.getPlatform)();
-    return `setup-uv-${CACHE_VERSION}-${(0, platforms_1.getArch)()}-${platform}-${pythonVersion}${cacheDependencyPathHash}${suffix}`;
+    const pruned = inputs_1.pruneCache ? "-pruned" : "";
+    return `setup-uv-${CACHE_VERSION}-${(0, platforms_1.getArch)()}-${platform}-${pythonVersion}${pruned}${cacheDependencyPathHash}${suffix}`;
 }
 async function getPythonVersion() {
     if (inputs_1.pythonVersion !== "") {
@@ -124757,7 +124758,7 @@ exports.ignoreNothingToCache = core.getInput("ignore-nothing-to-cache") === "tru
 exports.ignoreEmptyWorkdir = core.getInput("ignore-empty-workdir") === "true";
 exports.toolBinDir = getToolBinDir();
 exports.toolDir = getToolDir();
-exports.serverUrl = getServerUrl();
+exports.serverUrl = core.getInput("server-url");
 exports.githubToken = core.getInput("github-token");
 function getEnableCache() {
     const enableCacheInput = core.getInput("enable-cache");
@@ -124814,9 +124815,6 @@ function expandTilde(input) {
     }
     return input;
 }
-function getServerUrl() {
-    return core.getInput("server-url");
-}
 
 
 /***/ }),
diff --git a/src/cache/restore-cache.ts b/src/cache/restore-cache.ts
index f63fc48..dc697dc 100644
--- a/src/cache/restore-cache.ts
+++ b/src/cache/restore-cache.ts
@@ -4,6 +4,7 @@ import {
   cacheDependencyGlob,
   cacheLocalPath,
   cacheSuffix,
+  pruneCache,
   pythonVersion as pythonVersionInput,
   workingDirectory,
 } from "../utils/inputs";
@@ -55,7 +56,8 @@ async function computeKeys(): Promise<string> {
   const suffix = cacheSuffix ? `-${cacheSuffix}` : "";
   const pythonVersion = await getPythonVersion();
   const platform = await getPlatform();
-  return `setup-uv-${CACHE_VERSION}-${getArch()}-${platform}-${pythonVersion}${cacheDependencyPathHash}${suffix}`;
+  const pruned = pruneCache ? "-pruned" : "";
+  return `setup-uv-${CACHE_VERSION}-${getArch()}-${platform}-${pythonVersion}${pruned}${cacheDependencyPathHash}${suffix}`;
 }
 
 async function getPythonVersion(): Promise<string> {
diff --git a/src/utils/inputs.ts b/src/utils/inputs.ts
index 9749b69..6c0da1f 100644
--- a/src/utils/inputs.ts
+++ b/src/utils/inputs.ts
@@ -17,7 +17,7 @@ export const ignoreEmptyWorkdir =
   core.getInput("ignore-empty-workdir") === "true";
 export const toolBinDir = getToolBinDir();
 export const toolDir = getToolDir();
-export const serverUrl = getServerUrl();
+export const serverUrl = core.getInput("server-url");
 export const githubToken = core.getInput("github-token");
 
 function getEnableCache(): boolean {
@@ -85,7 +85,3 @@ function expandTilde(input: string): string {
   }
   return input;
 }
-
-function getServerUrl(): string {
-  return core.getInput("server-url");
-}