From 697ae3d9654e3d30be27fc044dfa443589a45faa Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Sun, 9 Feb 2025 02:31:53 +0100 Subject: [PATCH 1/5] docs: information about releases --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 6ccbd0283b..3316e2e475 100644 --- a/README.md +++ b/README.md @@ -547,3 +547,13 @@ This scheme is basic and needs improvements. Pull requests and ideas are welcome 3. Install dependencies: `npm install` 4. Build: `npm run build` 5. Run `npm run local` after any change to test it + +### Releases + +```bash +npm version -m "Upgrade to %s" +``` + +- https://docs.npmjs.com/cli/v11/commands/npm-version + +The "major tag" (ex: `v6`) should be deleted and then recreated manually. From db1c463e05c87f65a1da26368fb4f6639406da0a Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Sun, 9 Feb 2025 03:07:48 +0100 Subject: [PATCH 2/5] docs: move dev information into contribution guide --- .github/CONTRIBUTING.md => CONTRIBUTING.md | 18 ++++++++++++++++++ README.md | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) rename .github/CONTRIBUTING.md => CONTRIBUTING.md (71%) diff --git a/.github/CONTRIBUTING.md b/CONTRIBUTING.md similarity index 71% rename from .github/CONTRIBUTING.md rename to CONTRIBUTING.md index f740410d3b..9d465bf68e 100644 --- a/.github/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,3 +23,21 @@ * Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable. + +## Development of this action + +1. Install [act](https://github.com/nektos/act#installation) +2. Make a symlink for `act` to work properly: `ln -s . golangci-lint-action` +3. Install dependencies: `npm install` +4. Build: `npm run build` +5. Run `npm run local` after any change to test it + +### Releases + +```bash +npm version -m "Upgrade to %s" +``` + +- https://docs.npmjs.com/cli/v11/commands/npm-version + +The "major tag" (ex: `v6`) should be deleted and then recreated manually. diff --git a/README.md b/README.md index 3316e2e475..be93de974d 100644 --- a/README.md +++ b/README.md @@ -539,21 +539,3 @@ Inside our action, we perform 3 steps: GitHub matches keys by prefix if we have no exact match for the primary cache. This scheme is basic and needs improvements. Pull requests and ideas are welcome. - -## Development of this action - -1. Install [act](https://github.com/nektos/act#installation) -2. Make a symlink for `act` to work properly: `ln -s . golangci-lint-action` -3. Install dependencies: `npm install` -4. Build: `npm run build` -5. Run `npm run local` after any change to test it - -### Releases - -```bash -npm version -m "Upgrade to %s" -``` - -- https://docs.npmjs.com/cli/v11/commands/npm-version - -The "major tag" (ex: `v6`) should be deleted and then recreated manually. From d9c129682c68499e4b249d22ada18e936b119572 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 13:32:23 +0100 Subject: [PATCH 3/5] build(deps-dev): bump prettier from 3.4.2 to 3.5.0 in the dev-dependencies group (#1160) --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 92152a4d2c..722bdc8424 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "eslint-plugin-import": "^2.31.0", "eslint-plugin-prettier": "^5.2.3", "eslint-plugin-simple-import-sort": "^12.1.1", - "prettier": "^3.4.2", + "prettier": "^3.5.0", "typescript": "^5.7.3" } }, @@ -3119,10 +3119,11 @@ } }, "node_modules/prettier": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", - "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.0.tgz", + "integrity": "sha512-quyMrVt6svPS7CjQ9gKb3GLEX/rl3BCL2oa/QkNcXv4YNVBC9olt3s+H7ukto06q7B1Qz46PbrKLO34PR6vXcA==", "dev": true, + "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, diff --git a/package.json b/package.json index cb5f4f9501..9d1cb05676 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "eslint-plugin-import": "^2.31.0", "eslint-plugin-prettier": "^5.2.3", "eslint-plugin-simple-import-sort": "^12.1.1", - "prettier": "^3.4.2", + "prettier": "^3.5.0", "typescript": "^5.7.3" } } From b85ce4ff0a87a86a7c5cbb5f51fd4bb89b4b9eda Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Mon, 10 Feb 2025 15:33:29 +0100 Subject: [PATCH 4/5] fix: path patch (#1162) --- dist/post_run/index.js | 8 ++++---- dist/run/index.js | 8 ++++---- src/run.ts | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dist/post_run/index.js b/dist/post_run/index.js index e77a41cfff..806438ccf4 100644 --- a/dist/post_run/index.js +++ b/dist/post_run/index.js @@ -93982,7 +93982,7 @@ async function prepareEnv() { const binPath = await prepareLint(); const patchPath = await fetchPatch(); core.info(`Prepared env in ${Date.now() - startedAt}ms`); - return { binPath: binPath, patchPath }; + return { binPath, patchPath }; } const printOutput = (res) => { if (res.stdout) { @@ -93992,10 +93992,10 @@ const printOutput = (res) => { core.info(res.stderr); } }; -async function runLint(lintPath, patchPath) { +async function runLint(binPath, patchPath) { const debug = core.getInput(`debug`); if (debug.split(`,`).includes(`cache`)) { - const res = await execShellCommand(`${lintPath} cache status`); + const res = await execShellCommand(`${binPath} cache status`); printOutput(res); } let userArgs = core.getInput(`args`); @@ -94068,7 +94068,7 @@ async function runLint(lintPath, patchPath) { } cmdArgs.cwd = path.resolve(workingDirectory); } - const cmd = `${lintPath} run ${addedArgs.join(` `)} ${userArgs}`.trimEnd(); + const cmd = `${binPath} run ${addedArgs.join(` `)} ${userArgs}`.trimEnd(); core.info(`Running [${cmd}] in [${cmdArgs.cwd || process.cwd()}] ...`); const startedAt = Date.now(); try { diff --git a/dist/run/index.js b/dist/run/index.js index e32f5883d5..aeb04979ac 100644 --- a/dist/run/index.js +++ b/dist/run/index.js @@ -93982,7 +93982,7 @@ async function prepareEnv() { const binPath = await prepareLint(); const patchPath = await fetchPatch(); core.info(`Prepared env in ${Date.now() - startedAt}ms`); - return { binPath: binPath, patchPath }; + return { binPath, patchPath }; } const printOutput = (res) => { if (res.stdout) { @@ -93992,10 +93992,10 @@ const printOutput = (res) => { core.info(res.stderr); } }; -async function runLint(lintPath, patchPath) { +async function runLint(binPath, patchPath) { const debug = core.getInput(`debug`); if (debug.split(`,`).includes(`cache`)) { - const res = await execShellCommand(`${lintPath} cache status`); + const res = await execShellCommand(`${binPath} cache status`); printOutput(res); } let userArgs = core.getInput(`args`); @@ -94068,7 +94068,7 @@ async function runLint(lintPath, patchPath) { } cmdArgs.cwd = path.resolve(workingDirectory); } - const cmd = `${lintPath} run ${addedArgs.join(` `)} ${userArgs}`.trimEnd(); + const cmd = `${binPath} run ${addedArgs.join(` `)} ${userArgs}`.trimEnd(); core.info(`Running [${cmd}] in [${cmdArgs.cwd || process.cwd()}] ...`); const startedAt = Date.now(); try { diff --git a/src/run.ts b/src/run.ts index fb39467b2f..da83f1e840 100644 --- a/src/run.ts +++ b/src/run.ts @@ -156,7 +156,7 @@ async function prepareEnv(): Promise { core.info(`Prepared env in ${Date.now() - startedAt}ms`) - return { binPath: binPath, patchPath } + return { binPath, patchPath } } type ExecRes = { @@ -173,10 +173,10 @@ const printOutput = (res: ExecRes): void => { } } -async function runLint(lintPath: string, patchPath: string): Promise { +async function runLint(binPath: string, patchPath: string): Promise { const debug = core.getInput(`debug`) if (debug.split(`,`).includes(`cache`)) { - const res = await execShellCommand(`${lintPath} cache status`) + const res = await execShellCommand(`${binPath} cache status`) printOutput(res) } @@ -266,7 +266,7 @@ async function runLint(lintPath: string, patchPath: string): Promise { cmdArgs.cwd = path.resolve(workingDirectory) } - const cmd = `${lintPath} run ${addedArgs.join(` `)} ${userArgs}`.trimEnd() + const cmd = `${binPath} run ${addedArgs.join(` `)} ${userArgs}`.trimEnd() core.info(`Running [${cmd}] in [${cmdArgs.cwd || process.cwd()}] ...`) From 051d91933864810ecd5e2ea2cfd98f6a5bca5347 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Mon, 10 Feb 2025 15:34:05 +0100 Subject: [PATCH 5/5] 6.3.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 722bdc8424..7fb338ddb4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "golanci-lint-action", - "version": "6.3.1", + "version": "6.3.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "golanci-lint-action", - "version": "6.3.1", + "version": "6.3.2", "license": "MIT", "dependencies": { "@actions/cache": "^4.0.0", diff --git a/package.json b/package.json index 9d1cb05676..1bdf3c4137 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "golanci-lint-action", - "version": "6.3.1", + "version": "6.3.2", "private": true, "description": "golangci-lint github action", "main": "dist/main.js",