cloudflare/wrangler-action
1
0
Fork 0
mirror of https://github.com/cloudflare/wrangler-action.git synced 2024-11-22 10:03:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Address CR comments - check for an exact wrangler version match

Browse source
This commit is contained in:
Adishwar Rishi 2024-03-02 12:50:15 +11:00 committed by Peter Bacon Darwin
parent d1f1b4f3b3
commit 2523489ae1
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/index.ts
View file

@ -11,7 +11,7 @@ import {
setOutput, setOutput,
} from "@actions/core"; } from "@actions/core";
import { getExecOutput } from "@actions/exec"; import { getExecOutput } from "@actions/exec";
import semverGt from "semver/functions/gt"; import semverEq from "semver/functions/eq";
import { exec, execShell } from "./exec"; import { exec, execShell } from "./exec";
import { checkWorkingDirectory, semverCompare } from "./utils"; import { checkWorkingDirectory, semverCompare } from "./utils";
import { getPackageManager } from "./packageManagers"; import { getPackageManager } from "./packageManagers";
@ -23,6 +23,7 @@ const DEFAULT_WRANGLER_VERSION = "3.13.2";
*/ */
const config = { const config = {
WRANGLER_VERSION: getInput("wranglerVersion") || DEFAULT_WRANGLER_VERSION, WRANGLER_VERSION: getInput("wranglerVersion") || DEFAULT_WRANGLER_VERSION,
didUserProvideWranglerVersion: Boolean(getInput("wranglerVersion")),
secrets: getMultilineInput("secrets"), secrets: getMultilineInput("secrets"),
workingDirectory: checkWorkingDirectory(getInput("workingDirectory")), workingDirectory: checkWorkingDirectory(getInput("workingDirectory")),
CLOUDFLARE_API_TOKEN: getInput("apiToken"), CLOUDFLARE_API_TOKEN: getInput("apiToken"),
@ -102,13 +103,22 @@ async function installWrangler() {
); );
} }
installedVersion = versionMatch[1]; installedVersion = versionMatch[1];
if (semverGt(config["WRANGLER_VERSION"], installedVersion)) { if (config.didUserProvideWranglerVersion) {
if (semverEq(config.WRANGLER_VERSION, installedVersion)) {
info(`✅ Using Wrangler ${installedVersion}`, true);
endGroup();
return;
} else {
info(
`Wrangler version ${installedVersion} is not equal to the required version. Installing...`,
true,
);
}
} else {
info( info(
`Wrangler version ${installedVersion} is less than required. Installing...`, `✅ No wrangler version specified, using pre-installed wrangler version ${installedVersion}`,
true, true,
); );
} else {
info(`✅ Using Wrangler ${installedVersion}`, true);
endGroup(); endGroup();
return; return;
} }