Skip to content

Commit d9ee7e2

Browse files
authored
Remove deprecated input server-url (#607)
1 parent 59a0868 commit d9ee7e2

File tree

6 files changed

+15
-48
lines changed

6 files changed

+15
-48
lines changed

action.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ inputs:
2121
checksum:
2222
description: "The checksum of the uv version to install"
2323
required: false
24-
server-url:
25-
description: "(Deprecated) The server url to use when downloading uv"
26-
required: false
27-
default: "https://github.com"
2824
github-token:
2925
description:
3026
"Used to increase the rate limit when retrieving versions and downloading uv."

dist/save-cache/index.js

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/setup/index.js

Lines changed: 5 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/download/download-version.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export function tryGetFromToolCache(
2828
}
2929

3030
export async function downloadVersionFromGithub(
31-
serverUrl: string,
3231
platform: Platform,
3332
arch: Architecture,
3433
version: string,
@@ -37,7 +36,7 @@ export async function downloadVersionFromGithub(
3736
): Promise<{ version: string; cachedToolDir: string }> {
3837
const artifact = `uv-${arch}-${platform}`;
3938
const extension = getExtension(platform);
40-
const downloadUrl = `${serverUrl}/${OWNER}/${REPO}/releases/download/${version}/${artifact}${extension}`;
39+
const downloadUrl = `https://github.com/${OWNER}/${REPO}/releases/download/${version}/${artifact}${extension}`;
4140
return await downloadVersion(
4241
downloadUrl,
4342
artifact,
@@ -68,7 +67,6 @@ export async function downloadVersionFromManifest(
6867
`manifest-file does not contain version ${version}, arch ${arch}, platform ${platform}. Falling back to GitHub releases.`,
6968
);
7069
return await downloadVersionFromGithub(
71-
"https://github.com",
7270
platform,
7371
arch,
7472
version,

src/setup-uv.ts

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import * as core from "@actions/core";
44
import * as exec from "@actions/exec";
55
import { restoreCache } from "./cache/restore-cache";
66
import {
7-
downloadVersionFromGithub,
87
downloadVersionFromManifest,
98
resolveVersion,
109
tryGetFromToolCache,
@@ -20,7 +19,6 @@ import {
2019
ignoreEmptyWorkdir,
2120
manifestFile,
2221
pythonVersion,
23-
serverUrl,
2422
toolBinDir,
2523
toolDir,
2624
versionFile as versionFileInput,
@@ -99,29 +97,14 @@ async function setupUv(
9997
};
10098
}
10199

102-
let downloadVersionResult: { version: string; cachedToolDir: string };
103-
if (serverUrl !== "https://github.com") {
104-
core.warning(
105-
"The input server-url is deprecated. Please use manifest-file instead.",
106-
);
107-
downloadVersionResult = await downloadVersionFromGithub(
108-
serverUrl,
109-
platform,
110-
arch,
111-
resolvedVersion,
112-
checkSum,
113-
githubToken,
114-
);
115-
} else {
116-
downloadVersionResult = await downloadVersionFromManifest(
117-
manifestFile,
118-
platform,
119-
arch,
120-
resolvedVersion,
121-
checkSum,
122-
githubToken,
123-
);
124-
}
100+
const downloadVersionResult = await downloadVersionFromManifest(
101+
manifestFile,
102+
platform,
103+
arch,
104+
resolvedVersion,
105+
checkSum,
106+
githubToken,
107+
);
125108

126109
return {
127110
uvDir: downloadVersionResult.cachedToolDir,

src/utils/inputs.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export const ignoreEmptyWorkdir =
2020
core.getInput("ignore-empty-workdir") === "true";
2121
export const toolBinDir = getToolBinDir();
2222
export const toolDir = getToolDir();
23-
export const serverUrl = core.getInput("server-url");
2423
export const githubToken = core.getInput("github-token");
2524
export const manifestFile = getManifestFile();
2625
export const addProblemMatchers =

0 commit comments

Comments
 (0)