From 1b3cf9ae7cf4cd621952c062782f3e65253d0558 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Jun 2025 10:13:09 +0000 Subject: [PATCH 1/2] build(deps): bump @types/node in the dependencies group Bumps the dependencies group with 1 update: [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node). Updates `@types/node` from 22.15.30 to 24.0.2 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-version: 24.0.2 dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index fd34ab0e46..d5c62fd1de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@actions/http-client": "^2.2.3", "@actions/tool-cache": "^2.0.2", "@octokit/plugin-retry": "^6.1.0", - "@types/node": "^22.15.30", + "@types/node": "^24.0.2", "@types/semver": "^7.7.0", "@types/tmp": "^0.2.6", "@types/which": "^3.0.4", @@ -744,12 +744,12 @@ "dev": true }, "node_modules/@types/node": { - "version": "22.15.30", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.30.tgz", - "integrity": "sha512-6Q7lr06bEHdlfplU6YRbgG1SFBdlsfNC4/lX+SkhiTs0cpJkOElmWls8PxDFv4yY/xKb8Y6SO0OmSX4wgqTZbA==", + "version": "24.0.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.2.tgz", + "integrity": "sha512-Kv1shWMfCUnzbQTosAHrF2p8AzccoLODqJ0XqGPRA/mGVZR86KCk8I+fyh6B5+kcLtAKS9BquXUxVO79jU9UGg==", "license": "MIT", "dependencies": { - "undici-types": "~6.21.0" + "undici-types": "~7.8.0" } }, "node_modules/@types/node-fetch": { @@ -3775,9 +3775,9 @@ } }, "node_modules/undici-types": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", - "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz", + "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==", "license": "MIT" }, "node_modules/universal-user-agent": { diff --git a/package.json b/package.json index e5423f1cec..761e87f20a 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@actions/http-client": "^2.2.3", "@octokit/plugin-retry": "^6.1.0", "@actions/tool-cache": "^2.0.2", - "@types/node": "^22.15.30", + "@types/node": "^24.0.2", "@types/semver": "^7.7.0", "@types/tmp": "^0.2.6", "@types/which": "^3.0.4", From 0413dbc561582bd21848df3b14718a2e7e1e38b8 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Mon, 16 Jun 2025 12:30:46 +0200 Subject: [PATCH 2/2] chore: update implementation --- dist/post_run/index.js | 13 ++++++------- dist/run/index.js | 13 ++++++------- src/install.ts | 13 ++++++------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dist/post_run/index.js b/dist/post_run/index.js index 4005a2342b..11e2e680c8 100644 --- a/dist/post_run/index.js +++ b/dist/post_run/index.js @@ -92707,21 +92707,20 @@ function getAssetURL(versionInfo) { ext = "zip"; break; } - let arch = os_1.default.arch(); - switch (arch) { + let platformArch = "amd64"; + switch (os_1.default.arch()) { case "arm64": - arch = "arm64"; + platformArch = "arm64"; break; case "x64": - arch = "amd64"; + platformArch = "amd64"; break; - case "x32": case "ia32": - arch = "386"; + platformArch = "386"; break; } const noPrefix = versionInfo.TargetVersion.slice(1); - return `https://github.com/golangci/golangci-lint/releases/download/${versionInfo.TargetVersion}/golangci-lint-${noPrefix}-${platform}-${arch}.${ext}`; + return `https://github.com/golangci/golangci-lint/releases/download/${versionInfo.TargetVersion}/golangci-lint-${noPrefix}-${platform}-${platformArch}.${ext}`; } diff --git a/dist/run/index.js b/dist/run/index.js index f3eef28c05..f1802b10ae 100644 --- a/dist/run/index.js +++ b/dist/run/index.js @@ -92707,21 +92707,20 @@ function getAssetURL(versionInfo) { ext = "zip"; break; } - let arch = os_1.default.arch(); - switch (arch) { + let platformArch = "amd64"; + switch (os_1.default.arch()) { case "arm64": - arch = "arm64"; + platformArch = "arm64"; break; case "x64": - arch = "amd64"; + platformArch = "amd64"; break; - case "x32": case "ia32": - arch = "386"; + platformArch = "386"; break; } const noPrefix = versionInfo.TargetVersion.slice(1); - return `https://github.com/golangci/golangci-lint/releases/download/${versionInfo.TargetVersion}/golangci-lint-${noPrefix}-${platform}-${arch}.${ext}`; + return `https://github.com/golangci/golangci-lint/releases/download/${versionInfo.TargetVersion}/golangci-lint-${noPrefix}-${platform}-${platformArch}.${ext}`; } diff --git a/src/install.ts b/src/install.ts index 1f5083fd6f..d23cd1fda9 100644 --- a/src/install.ts +++ b/src/install.ts @@ -160,21 +160,20 @@ function getAssetURL(versionInfo: VersionInfo): string { break } - let arch = os.arch() - switch (arch) { + let platformArch = "amd64" + switch (os.arch()) { case "arm64": - arch = "arm64" + platformArch = "arm64" break case "x64": - arch = "amd64" + platformArch = "amd64" break - case "x32": case "ia32": - arch = "386" + platformArch = "386" break } const noPrefix = versionInfo.TargetVersion.slice(1) - return `https://github.com/golangci/golangci-lint/releases/download/${versionInfo.TargetVersion}/golangci-lint-${noPrefix}-${platform}-${arch}.${ext}` + return `https://github.com/golangci/golangci-lint/releases/download/${versionInfo.TargetVersion}/golangci-lint-${noPrefix}-${platform}-${platformArch}.${ext}` }