Respect UV_CACHE_DIR and cache-dir (#612)

Fixes: #583

src/setup-uv.ts

@@ -8,6 +8,7 @@ import {
   resolveVersion,
   tryGetFromToolCache,
 } from "./download/download-version";
+import { getConfigValueFromTomlFile } from "./utils/config-file";
 import { STATE_UV_PATH, STATE_UV_VERSION } from "./utils/constants";
 import {
   activateEnvironment as activateEnvironmentInput,
@@ -53,7 +54,7 @@ async function run(): Promise<void> {
     setupPython();
     await activateEnvironment();
     addMatchers();
-    setCacheDir(cacheLocalPath);
+    setCacheDir();
 
     core.setOutput("uv-version", setupResult.version);
     core.saveState(STATE_UV_VERSION, setupResult.version);
@@ -224,9 +225,18 @@ async function activateEnvironment(): Promise<void> {
   }
 }
 
-function setCacheDir(cacheLocalPath: string): void {
-  core.exportVariable("UV_CACHE_DIR", cacheLocalPath);
-  core.info(`Set UV_CACHE_DIR to ${cacheLocalPath}`);
+function setCacheDir(): void {
+  if (enableCache) {
+    const cacheDirFromConfig = getConfigValueFromTomlFile("", "cache-dir");
+    if (cacheDirFromConfig !== undefined) {
+      core.info(
+        "Using cache-dir from uv config file, not modifying UV_CACHE_DIR",
+      );
+      return;
+    }
+    core.exportVariable("UV_CACHE_DIR", cacheLocalPath);
+    core.info(`Set UV_CACHE_DIR to ${cacheLocalPath}`);
+  }
 }
 
 function addMatchers(): void {

src/utils/config-file.ts

@@ -0,0 +1,24 @@
+import fs from "node:fs";
+import * as toml from "smol-toml";
+
+export function getConfigValueFromTomlFile(
+  filePath: string,
+  key: string,
+): string | undefined {
+  if (!fs.existsSync(filePath) || !filePath.endsWith(".toml")) {
+    return undefined;
+  }
+  const fileContent = fs.readFileSync(filePath, "utf-8");
+
+  if (filePath.endsWith("pyproject.toml")) {
+    const tomlContent = toml.parse(fileContent) as {
+      tool?: { uv?: Record<string, string | undefined> };
+    };
+    return tomlContent?.tool?.uv?.[key];
+  }
+  const tomlContent = toml.parse(fileContent) as Record<
+    string,
+    string | undefined
+  >;
+  return tomlContent[key];
+}

src/utils/inputs.ts

@@ -1,5 +1,6 @@
 import path from "node:path";
 import * as core from "@actions/core";
+import { getConfigValueFromTomlFile } from "./config-file";
 
 export const workingDirectory = core.getInput("working-directory");
 export const version = core.getInput("version");
@@ -82,6 +83,14 @@ function getCacheLocalPath(): string {
     const tildeExpanded = expandTilde(cacheLocalPathInput);
     return resolveRelativePath(tildeExpanded);
   }
+  const cacheDirFromConfig = getCacheDirFromConfig();
+  if (cacheDirFromConfig !== undefined) {
+    return cacheDirFromConfig;
+  }
+  if (process.env.UV_CACHE_DIR !== undefined) {
+    core.info(`UV_CACHE_DIR is already set to ${process.env.UV_CACHE_DIR}`);
+    return process.env.UV_CACHE_DIR;
+  }
   if (process.env.RUNNER_ENVIRONMENT === "github-hosted") {
     if (process.env.RUNNER_TEMP !== undefined) {
       return `${process.env.RUNNER_TEMP}${path.sep}setup-uv-cache`;
@@ -96,6 +105,24 @@ function getCacheLocalPath(): string {
   return `${process.env.HOME}${path.sep}.cache${path.sep}uv`;
 }
 
+function getCacheDirFromConfig(): string | undefined {
+  for (const filePath of [versionFile, "uv.toml", "pyproject.toml"]) {
+    const resolvedPath = resolveRelativePath(filePath);
+    try {
+      const cacheDir = getConfigValueFromTomlFile(resolvedPath, "cache-dir");
+      if (cacheDir !== undefined) {
+        core.info(`Found cache-dir in ${resolvedPath}: ${cacheDir}`);
+        return cacheDir;
+      }
+    } catch (err) {
+      const message = (err as Error).message;
+      core.warning(`Error while parsing ${filePath}: ${message}`);
+      return undefined;
+    }
+  }
+  return undefined;
+}
+
 function getCacheDependencyGlob(): string {
   const cacheDependencyGlobInput = core.getInput("cache-dependency-glob");
   if (cacheDependencyGlobInput !== "") {

src/version/config-file.ts

@@ -1,22 +0,0 @@
-import fs from "node:fs";
-import * as toml from "smol-toml";
-
-export function getRequiredVersionFromConfigFile(
-  filePath: string,
-): string | undefined {
-  if (!filePath.endsWith(".toml")) {
-    return undefined;
-  }
-  const fileContent = fs.readFileSync(filePath, "utf-8");
-
-  if (filePath.endsWith("pyproject.toml")) {
-    const tomlContent = toml.parse(fileContent) as {
-      tool?: { uv?: { "required-version"?: string } };
-    };
-    return tomlContent?.tool?.uv?.["required-version"];
-  }
-  const tomlContent = toml.parse(fileContent) as {
-    "required-version"?: string;
-  };
-  return tomlContent["required-version"];
-}

src/version/resolve.ts

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import * as core from "@actions/core";
-import { getRequiredVersionFromConfigFile } from "./config-file";
+import { getConfigValueFromTomlFile } from "../utils/config-file";
 import { getUvVersionFromRequirementsFile } from "./requirements-file";
 import { getUvVersionFromToolVersions } from "./tool-versions-file";
 
@@ -14,7 +14,7 @@ export function getUvVersionFromFile(filePath: string): string | undefined {
   try {
     uvVersion = getUvVersionFromToolVersions(filePath);
     if (uvVersion === undefined) {
-      uvVersion = getRequiredVersionFromConfigFile(filePath);
+      uvVersion = getConfigValueFromTomlFile(filePath, "required-version");
     }
     if (uvVersion === undefined) {
       uvVersion = getUvVersionFromRequirementsFile(filePath);