From d9ee7e2f262885c8843e45732f53001dc76be009 Mon Sep 17 00:00:00 2001 From: Kevin Stillhammer Date: Fri, 3 Oct 2025 19:48:56 +0200 Subject: [PATCH] Remove deprecated input server-url (#607) --- action.yml | 4 ---- dist/save-cache/index.js | 3 +-- dist/setup/index.js | 18 +++++------------ src/download/download-version.ts | 4 +--- src/setup-uv.ts | 33 ++++++++------------------------ src/utils/inputs.ts | 1 - 6 files changed, 15 insertions(+), 48 deletions(-) diff --git a/action.yml b/action.yml index 0a591c3..c1a9426 100644 --- a/action.yml +++ b/action.yml @@ -21,10 +21,6 @@ inputs: checksum: description: "The checksum of the uv version to install" required: false - server-url: - description: "(Deprecated) The server url to use when downloading uv" - required: false - default: "https://github.com" github-token: description: "Used to increase the rate limit when retrieving versions and downloading uv." diff --git a/dist/save-cache/index.js b/dist/save-cache/index.js index 61b69ee..4d70df4 100644 --- a/dist/save-cache/index.js +++ b/dist/save-cache/index.js @@ -90152,7 +90152,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.addProblemMatchers = exports.manifestFile = exports.githubToken = exports.serverUrl = exports.toolDir = exports.toolBinDir = exports.ignoreEmptyWorkdir = exports.ignoreNothingToCache = exports.pruneCache = exports.cacheDependencyGlob = exports.cacheLocalPath = exports.cacheSuffix = exports.saveCache = exports.restoreCache = exports.enableCache = exports.checkSum = exports.activateEnvironment = exports.pythonVersion = exports.versionFile = exports.version = exports.workingDirectory = void 0; +exports.addProblemMatchers = exports.manifestFile = exports.githubToken = exports.toolDir = exports.toolBinDir = exports.ignoreEmptyWorkdir = exports.ignoreNothingToCache = exports.pruneCache = exports.cacheDependencyGlob = exports.cacheLocalPath = exports.cacheSuffix = exports.saveCache = exports.restoreCache = exports.enableCache = exports.checkSum = exports.activateEnvironment = exports.pythonVersion = exports.versionFile = exports.version = exports.workingDirectory = void 0; const node_path_1 = __importDefault(__nccwpck_require__(6760)); const core = __importStar(__nccwpck_require__(7484)); exports.workingDirectory = core.getInput("working-directory"); @@ -90172,7 +90172,6 @@ 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 = core.getInput("server-url"); exports.githubToken = core.getInput("github-token"); exports.manifestFile = getManifestFile(); exports.addProblemMatchers = core.getInput("add-problem-matchers") === "true"; diff --git a/dist/setup/index.js b/dist/setup/index.js index bfd6bf1..cef5b6c 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -128998,17 +128998,17 @@ function tryGetFromToolCache(arch, version) { const installedPath = tc.find(constants_1.TOOL_CACHE_NAME, resolvedVersion, arch); return { installedPath, version: resolvedVersion }; } -async function downloadVersionFromGithub(serverUrl, platform, arch, version, checkSum, githubToken) { +async function downloadVersionFromGithub(platform, arch, version, checkSum, githubToken) { const artifact = `uv-${arch}-${platform}`; const extension = getExtension(platform); - const downloadUrl = `${serverUrl}/${constants_1.OWNER}/${constants_1.REPO}/releases/download/${version}/${artifact}${extension}`; + const downloadUrl = `https://github.com/${constants_1.OWNER}/${constants_1.REPO}/releases/download/${version}/${artifact}${extension}`; return await downloadVersion(downloadUrl, artifact, platform, arch, version, checkSum, githubToken); } async function downloadVersionFromManifest(manifestUrl, platform, arch, version, checkSum, githubToken) { const downloadUrl = await (0, version_manifest_1.getDownloadUrl)(manifestUrl, version, arch, platform); if (!downloadUrl) { core.info(`manifest-file does not contain version ${version}, arch ${arch}, platform ${platform}. Falling back to GitHub releases.`); - return await downloadVersionFromGithub("https://github.com", platform, arch, version, checkSum, githubToken); + return await downloadVersionFromGithub(platform, arch, version, checkSum, githubToken); } return await downloadVersion(downloadUrl, `uv-${arch}-${platform}`, platform, arch, version, checkSum, githubToken); } @@ -129441,14 +129441,7 @@ async function setupUv(platform, arch, checkSum, githubToken) { version: toolCacheResult.version, }; } - let downloadVersionResult; - if (inputs_1.serverUrl !== "https://github.com") { - core.warning("The input server-url is deprecated. Please use manifest-file instead."); - downloadVersionResult = await (0, download_version_1.downloadVersionFromGithub)(inputs_1.serverUrl, platform, arch, resolvedVersion, checkSum, githubToken); - } - else { - downloadVersionResult = await (0, download_version_1.downloadVersionFromManifest)(inputs_1.manifestFile, platform, arch, resolvedVersion, checkSum, githubToken); - } + const downloadVersionResult = await (0, download_version_1.downloadVersionFromManifest)(inputs_1.manifestFile, platform, arch, resolvedVersion, checkSum, githubToken); return { uvDir: downloadVersionResult.cachedToolDir, version: downloadVersionResult.version, @@ -129644,7 +129637,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.addProblemMatchers = exports.manifestFile = exports.githubToken = exports.serverUrl = exports.toolDir = exports.toolBinDir = exports.ignoreEmptyWorkdir = exports.ignoreNothingToCache = exports.pruneCache = exports.cacheDependencyGlob = exports.cacheLocalPath = exports.cacheSuffix = exports.saveCache = exports.restoreCache = exports.enableCache = exports.checkSum = exports.activateEnvironment = exports.pythonVersion = exports.versionFile = exports.version = exports.workingDirectory = void 0; +exports.addProblemMatchers = exports.manifestFile = exports.githubToken = exports.toolDir = exports.toolBinDir = exports.ignoreEmptyWorkdir = exports.ignoreNothingToCache = exports.pruneCache = exports.cacheDependencyGlob = exports.cacheLocalPath = exports.cacheSuffix = exports.saveCache = exports.restoreCache = exports.enableCache = exports.checkSum = exports.activateEnvironment = exports.pythonVersion = exports.versionFile = exports.version = exports.workingDirectory = void 0; const node_path_1 = __importDefault(__nccwpck_require__(76760)); const core = __importStar(__nccwpck_require__(37484)); exports.workingDirectory = core.getInput("working-directory"); @@ -129664,7 +129657,6 @@ 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 = core.getInput("server-url"); exports.githubToken = core.getInput("github-token"); exports.manifestFile = getManifestFile(); exports.addProblemMatchers = core.getInput("add-problem-matchers") === "true"; diff --git a/src/download/download-version.ts b/src/download/download-version.ts index 85f72a0..37864a3 100644 --- a/src/download/download-version.ts +++ b/src/download/download-version.ts @@ -28,7 +28,6 @@ export function tryGetFromToolCache( } export async function downloadVersionFromGithub( - serverUrl: string, platform: Platform, arch: Architecture, version: string, @@ -37,7 +36,7 @@ export async function downloadVersionFromGithub( ): Promise<{ version: string; cachedToolDir: string }> { const artifact = `uv-${arch}-${platform}`; const extension = getExtension(platform); - const downloadUrl = `${serverUrl}/${OWNER}/${REPO}/releases/download/${version}/${artifact}${extension}`; + const downloadUrl = `https://github.com/${OWNER}/${REPO}/releases/download/${version}/${artifact}${extension}`; return await downloadVersion( downloadUrl, artifact, @@ -68,7 +67,6 @@ export async function downloadVersionFromManifest( `manifest-file does not contain version ${version}, arch ${arch}, platform ${platform}. Falling back to GitHub releases.`, ); return await downloadVersionFromGithub( - "https://github.com", platform, arch, version, diff --git a/src/setup-uv.ts b/src/setup-uv.ts index 7b4fe56..5de32da 100644 --- a/src/setup-uv.ts +++ b/src/setup-uv.ts @@ -4,7 +4,6 @@ import * as core from "@actions/core"; import * as exec from "@actions/exec"; import { restoreCache } from "./cache/restore-cache"; import { - downloadVersionFromGithub, downloadVersionFromManifest, resolveVersion, tryGetFromToolCache, @@ -20,7 +19,6 @@ import { ignoreEmptyWorkdir, manifestFile, pythonVersion, - serverUrl, toolBinDir, toolDir, versionFile as versionFileInput, @@ -99,29 +97,14 @@ async function setupUv( }; } - let downloadVersionResult: { version: string; cachedToolDir: string }; - if (serverUrl !== "https://github.com") { - core.warning( - "The input server-url is deprecated. Please use manifest-file instead.", - ); - downloadVersionResult = await downloadVersionFromGithub( - serverUrl, - platform, - arch, - resolvedVersion, - checkSum, - githubToken, - ); - } else { - downloadVersionResult = await downloadVersionFromManifest( - manifestFile, - platform, - arch, - resolvedVersion, - checkSum, - githubToken, - ); - } + const downloadVersionResult = await downloadVersionFromManifest( + manifestFile, + platform, + arch, + resolvedVersion, + checkSum, + githubToken, + ); return { uvDir: downloadVersionResult.cachedToolDir, diff --git a/src/utils/inputs.ts b/src/utils/inputs.ts index 4819758..d971d79 100644 --- a/src/utils/inputs.ts +++ b/src/utils/inputs.ts @@ -20,7 +20,6 @@ export const ignoreEmptyWorkdir = core.getInput("ignore-empty-workdir") === "true"; export const toolBinDir = getToolBinDir(); export const toolDir = getToolDir(); -export const serverUrl = core.getInput("server-url"); export const githubToken = core.getInput("github-token"); export const manifestFile = getManifestFile(); export const addProblemMatchers =