mirror of
https://github.com/tailscale/github-action.git
synced 2026-08-20 07:19:22 +00:00
Bump prettier from 2.8.8 to 3.7.4
Bumps [prettier](https://github.com/prettier/prettier) from 2.8.8 to 3.7.4. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.7.4) --- updated-dependencies: - dependency-name: prettier dependency-version: 3.7.4 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot]
Mario Minardi
parent
afff14da14
commit
2d4cde5889
4 changed files with 38 additions and 38 deletions
12
package-lock.json
generated
12
package-lock.json
generated
|
|
@ -19,7 +19,7 @@
|
|||
"devDependencies": {
|
||||
"@types/node": "^24.10.2",
|
||||
"@vercel/ncc": "^0.38.3",
|
||||
"prettier": "^2.5.1",
|
||||
"prettier": "^3.7.4",
|
||||
"prettier-plugin-organize-imports": "^3.2.2",
|
||||
"typescript": "^5.8.3"
|
||||
},
|
||||
|
|
@ -1136,17 +1136,17 @@
|
|||
}
|
||||
},
|
||||
"node_modules/prettier": {
|
||||
"version": "2.8.8",
|
||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
|
||||
"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
|
||||
"version": "3.7.4",
|
||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.7.4.tgz",
|
||||
"integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"bin": {
|
||||
"prettier": "bin-prettier.js"
|
||||
"prettier": "bin/prettier.cjs"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10.13.0"
|
||||
"node": ">=14"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/prettier/prettier?sponsor=1"
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
"@types/node": "^24.10.2",
|
||||
"@vercel/ncc": "^0.38.3",
|
||||
"typescript": "^5.8.3",
|
||||
"prettier": "^2.5.1",
|
||||
"prettier": "^3.7.4",
|
||||
"prettier-plugin-organize-imports": "^3.2.2"
|
||||
},
|
||||
"overrides": {
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ async function logout(): Promise<void> {
|
|||
// Don't fail the action if logout fails - it's just cleanup
|
||||
core.warning(`Failed to logout from Tailscale: ${error}`);
|
||||
core.info(
|
||||
"Your ephemeral node will eventually be cleaned up by Tailscale"
|
||||
"Your ephemeral node will eventually be cleaned up by Tailscale",
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
|
|
|
|||
60
src/main.ts
60
src/main.ts
|
|
@ -81,7 +81,7 @@ async function run(): Promise<void> {
|
|||
config.useCache
|
||||
) {
|
||||
throw new Error(
|
||||
"Caching of unstable releases is not supported on macOS runners"
|
||||
"Caching of unstable releases is not supported on macOS runners",
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -125,7 +125,7 @@ async function run(): Promise<void> {
|
|||
core.warning(`Failed to get Tailscale status: ${err}`);
|
||||
if (runnerOS === runnerMacOS) {
|
||||
core.setFailed(
|
||||
`❌ Tailscale status is required in order to configure macOS`
|
||||
`❌ Tailscale status is required in order to configure macOS`,
|
||||
);
|
||||
process.exit(2);
|
||||
}
|
||||
|
|
@ -147,8 +147,8 @@ async function pingHostsIfNecessary(config: TailscaleConfig): Promise<void> {
|
|||
|
||||
core.info(
|
||||
`Will ping hosts ${config.pingHosts.join(
|
||||
","
|
||||
)} up to 3 minutes each (in parallel) in order to check connectivity`
|
||||
",",
|
||||
)} up to 3 minutes each (in parallel) in order to check connectivity`,
|
||||
);
|
||||
let pings = config.pingHosts.map((host) => pingHost(host));
|
||||
for (const ping of pings) {
|
||||
|
|
@ -232,7 +232,7 @@ async function getInputs(): Promise<TailscaleConfig> {
|
|||
|
||||
if (config.oauthSecret && !config.tags) {
|
||||
throw new Error(
|
||||
"the tags parameter is required when using an OAuth client"
|
||||
"the tags parameter is required when using an OAuth client",
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -246,7 +246,7 @@ function validateAuth(config: TailscaleConfig): void {
|
|||
(!config.audience || !config.oauthClientId || !config.tags)
|
||||
) {
|
||||
throw new Error(
|
||||
"Please provide either an auth key, OAuth secret and tags, or federated identity client ID and audience with tags."
|
||||
"Please provide either an auth key, OAuth secret and tags, or federated identity client ID and audience with tags.",
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -256,14 +256,14 @@ function validateAuth(config: TailscaleConfig): void {
|
|||
semver.gt("1.90.0", config.version)
|
||||
) {
|
||||
throw new Error(
|
||||
"Workload identity federation requires using tailscale version 1.90.0 or later."
|
||||
"Workload identity federation requires using tailscale version 1.90.0 or later.",
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
async function resolveVersion(
|
||||
version: string,
|
||||
runnerOS: string
|
||||
runnerOS: string,
|
||||
): Promise<string> {
|
||||
if (runnerOS === runnerMacOS && version === versionUnstable) {
|
||||
return "main";
|
||||
|
|
@ -331,7 +331,7 @@ function getTailscaleArch(runnerOS: string): string {
|
|||
|
||||
async function installTailscale(
|
||||
config: TailscaleConfig,
|
||||
runnerOS: string
|
||||
runnerOS: string,
|
||||
): Promise<void> {
|
||||
const cacheKey = generateCacheKey(config, runnerOS);
|
||||
const toolPath = getToolPath(config, runnerOS);
|
||||
|
|
@ -341,7 +341,7 @@ async function installTailscale(
|
|||
const cacheHit = await cache.restoreCache([toolPath], cacheKey);
|
||||
if (cacheHit) {
|
||||
core.info(
|
||||
`Found Tailscale ${config.resolvedVersion} in cache: ${toolPath}`
|
||||
`Found Tailscale ${config.resolvedVersion} in cache: ${toolPath}`,
|
||||
);
|
||||
|
||||
// For Windows, install the cached MSI
|
||||
|
|
@ -394,7 +394,7 @@ async function calculateFileSha256(filePath: string): Promise<string> {
|
|||
|
||||
async function installTailscaleLinux(
|
||||
config: TailscaleConfig,
|
||||
toolPath: string
|
||||
toolPath: string,
|
||||
): Promise<void> {
|
||||
// Determine if stable or unstable
|
||||
const minor = parseInt(config.resolvedVersion.split(".")[1]);
|
||||
|
|
@ -435,18 +435,18 @@ async function installTailscaleLinux(
|
|||
const extractedPath = await tc.extractTar(tarPath, undefined, "xz");
|
||||
const extractedDir = path.join(
|
||||
extractedPath,
|
||||
`tailscale_${config.resolvedVersion}_${config.arch}`
|
||||
`tailscale_${config.resolvedVersion}_${config.arch}`,
|
||||
);
|
||||
|
||||
// Create tool directory and copy binaries there for caching
|
||||
fs.mkdirSync(toolPath, { recursive: true });
|
||||
fs.copyFileSync(
|
||||
path.join(extractedDir, cmdTailscale),
|
||||
path.join(toolPath, cmdTailscale)
|
||||
path.join(toolPath, cmdTailscale),
|
||||
);
|
||||
fs.copyFileSync(
|
||||
path.join(extractedDir, cmdTailscaled),
|
||||
path.join(toolPath, cmdTailscaled)
|
||||
path.join(toolPath, cmdTailscaled),
|
||||
);
|
||||
|
||||
// Install binaries to /usr/local/bin
|
||||
|
|
@ -473,7 +473,7 @@ async function installTailscaleLinux(
|
|||
async function installTailscaleWindows(
|
||||
config: TailscaleConfig,
|
||||
toolPath: string,
|
||||
fromCache: boolean = false
|
||||
fromCache: boolean = false,
|
||||
): Promise<void> {
|
||||
// Create tool directory
|
||||
fs.mkdirSync(toolPath, { recursive: true });
|
||||
|
|
@ -544,14 +544,14 @@ async function installTailscaleWindows(
|
|||
|
||||
async function installTailscaleMacOS(
|
||||
config: TailscaleConfig,
|
||||
toolPath: string
|
||||
toolPath: string,
|
||||
): Promise<void> {
|
||||
core.info("Building tailscale from src on macOS...");
|
||||
|
||||
// Clone the repo
|
||||
await execSilent(
|
||||
"glone tailscale repo",
|
||||
"git clone https://github.com/tailscale/tailscale.git tailscale"
|
||||
"git clone https://github.com/tailscale/tailscale.git tailscale",
|
||||
);
|
||||
|
||||
// Checkout the resolved version
|
||||
|
|
@ -561,7 +561,7 @@ async function installTailscaleMacOS(
|
|||
[],
|
||||
{
|
||||
cwd: cmdTailscale,
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
// Create tool directory and copy binaries there for caching
|
||||
|
|
@ -579,7 +579,7 @@ async function installTailscaleMacOS(
|
|||
...process.env,
|
||||
TS_USE_TOOLCHAIN: "1",
|
||||
},
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -665,7 +665,7 @@ async function waitForDaemonReady(): Promise<void> {
|
|||
// If we get any valid response from the API, the daemon is ready
|
||||
if (status) {
|
||||
core.info(
|
||||
`Daemon ready! Initial state: ${status.BackendState || "Unknown"}`
|
||||
`Daemon ready! Initial state: ${status.BackendState || "Unknown"}`,
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
|
@ -679,13 +679,13 @@ async function waitForDaemonReady(): Promise<void> {
|
|||
}
|
||||
|
||||
throw new Error(
|
||||
`tailscaled daemon did not become ready within timeout, last error: ${lastErr}`
|
||||
`tailscaled daemon did not become ready within timeout, last error: ${lastErr}`,
|
||||
);
|
||||
}
|
||||
|
||||
async function connectToTailscale(
|
||||
config: TailscaleConfig,
|
||||
runnerOS: string
|
||||
runnerOS: string,
|
||||
): Promise<void> {
|
||||
// Determine hostname
|
||||
let hostname = config.hostname;
|
||||
|
|
@ -761,13 +761,13 @@ async function connectToTailscale(
|
|||
await Promise.race([
|
||||
execSilent("tailscale up", execArgs[0], execArgs.slice(1)),
|
||||
new Promise<never>((_, reject) =>
|
||||
setTimeout(() => reject(new Error("Timeout")), timeoutMs)
|
||||
setTimeout(() => reject(new Error("Timeout")), timeoutMs),
|
||||
),
|
||||
]);
|
||||
|
||||
// Success
|
||||
core.info(
|
||||
`✅ Tailscale up command completed successfully on attempt ${attempt}`
|
||||
`✅ Tailscale up command completed successfully on attempt ${attempt}`,
|
||||
);
|
||||
return;
|
||||
} catch (error) {
|
||||
|
|
@ -808,7 +808,7 @@ function sleep(ms: number): Promise<void> {
|
|||
|
||||
function generateCacheKey(
|
||||
config: TailscaleConfig,
|
||||
runnerOS: string
|
||||
runnerOS: string,
|
||||
): string | undefined {
|
||||
if (!config.useCache) {
|
||||
return undefined;
|
||||
|
|
@ -827,13 +827,13 @@ function getToolPath(config: TailscaleConfig, runnerOS: string): string {
|
|||
cacheDirectory,
|
||||
cmdTailscale,
|
||||
config.resolvedVersion,
|
||||
`${runnerOS}-${config.arch}`
|
||||
`${runnerOS}-${config.arch}`,
|
||||
);
|
||||
}
|
||||
|
||||
async function installCachedBinaries(
|
||||
toolPath: string,
|
||||
runnerOS: string
|
||||
runnerOS: string,
|
||||
): Promise<void> {
|
||||
if (runnerOS === runnerLinux || runnerOS === runnerMacOS) {
|
||||
// Copy cached binaries to /usr/local/bin
|
||||
|
|
@ -874,7 +874,7 @@ async function configureDNSOnMacOS(status: tailscaleStatus): Promise<void> {
|
|||
}
|
||||
|
||||
core.info(
|
||||
`Setting system DNS server to 100.100.100.100 and searchdomains to ${status.CurrentTailnet.MagicDNSSuffix}`
|
||||
`Setting system DNS server to 100.100.100.100 and searchdomains to ${status.CurrentTailnet.MagicDNSSuffix}`,
|
||||
);
|
||||
try {
|
||||
await execSilent("set dns servers", "networksetup", [
|
||||
|
|
@ -911,7 +911,7 @@ async function execSilent(
|
|||
label: string,
|
||||
cmd: string,
|
||||
args?: string[],
|
||||
opts?: {}
|
||||
opts?: {},
|
||||
): Promise<exec.ExecOutput> {
|
||||
core.info(`▶️ ${label}`);
|
||||
const out = await exec.getExecOutput(cmd, args, {
|
||||
|
|
@ -927,7 +927,7 @@ async function execSilent(
|
|||
throw new execError(
|
||||
`${cmd} failed with exit code ${out.exitCode}`,
|
||||
out.exitCode,
|
||||
out.stderr
|
||||
out.stderr,
|
||||
);
|
||||
}
|
||||
return out;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue