chore: improve marketplace style

.github/workflows/test.yml

@@ -52,8 +52,8 @@ jobs:
         version:
           - ""
           - "latest"
-          - "v1.56"
+          - "v1.58"
-          - "v1.56.1"
+          - "v1.58.0"
     runs-on: ${{ matrix.os }}
     permissions:
       contents: read
@@ -63,7 +63,6 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: oldstable
-          cache: false # setup-go v4 caches by default
       - uses: ./
         with:
           version: ${{ matrix.version }}
@@ -81,8 +80,8 @@ jobs:
         version:
           - ""
           - "latest"
-          - "v1.56.1"
+          - "v1.58.0"
-          - "bf5008a11acf2da5fe76716eb21d808499e079fa"
+          - "4bf574a12bb61234e28e3d6172be6ed95b0e8baf"
     runs-on: ${{ matrix.os }}
     permissions:
       contents: read
@@ -92,7 +91,6 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: oldstable
-          cache: false # setup-go v4 caches by default
       - uses: ./
         with:
           version: ${{ matrix.version }}
@@ -116,7 +114,6 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: oldstable
-          cache: false # setup-go v4 caches by default
       - uses: ./
         with:
           working-directory: sample-go-mod

README.md

@@ -3,13 +3,15 @@
 [![Build Status](https://github.com/golangci/golangci-lint-action/workflows/build-and-test/badge.svg)](https://github.com/golangci/golangci-lint-action/actions)
 
 It's the official GitHub action for [golangci-lint](https://github.com/golangci/golangci-lint) from its authors.
+
 The action runs [golangci-lint](https://github.com/golangci/golangci-lint) and reports issues from linters.
 
 ![GitHub Annotations](./static/annotations.png)
 
 ## Compatibility
 
-* `v4.0.0+` requires an explicit setup-go installation step before using this action: `uses: actions/setup-go@v5`.
+* `v5.0.0+` removes `skip-pkg-cache` and `skip-build-cache` because the cache related to Go itself is already handled by `actions/setup-go`.
+* `v4.0.0+` requires an explicit `actions/setup-go` installation step before using this action: `uses: actions/setup-go@v5`.
   The `skip-go-installation` option has been removed.
 * `v2.0.0+` works with `golangci-lint` version >= `v1.28.3`
 * `v1.2.2` is deprecated due to we forgot to change the minimum version of `golangci-lint` to `v1.28.3` ([issue](https://github.com/golangci/golangci-lint-action/issues/39))
@@ -24,8 +26,8 @@ name: golangci-lint
 on:
   push:
     branches:
-      - master
       - main
+      - master
   pull_request:
 
 permissions:
@@ -41,56 +43,29 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
-          cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v5
         with:
-          # Require: The version of golangci-lint to use.
+          version: latest
-          # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
-          # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
-          version: v1.54
-
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-
-          # Optional: golangci-lint command line arguments.
-          #
-          # Note: By default, the `.golangci.yml` file should be at the root of the repository.
-          # The location of the configuration file can be changed by using `--config=`
-          # args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0 
-
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true
-
-          # Optional: if set to true, then all caching functionality will be completely disabled,
-          #           takes precedence over all other caching options.
-          # skip-cache: true
-
-          # Optional: if set to true, then the action won't cache or restore ~/go/pkg.
-          # skip-pkg-cache: true
-
-          # Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
-          # skip-build-cache: true
-
-          # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
-          # install-mode: "goinstall"
 ```
 
-We recommend running this action in a job separate from other jobs (`go test`, etc)
+We recommend running this action in a job separate from other jobs (`go test`, etc.)
 because different jobs [run in parallel](https://help.github.com/en/actions/getting-started-with-github-actions/core-concepts-for-github-actions#job).
 
 ### Multiple OS Support
 
-If you need to run linters for specific operating systems, you will need to use the action `>=v2`.  Here is a sample configuration file:
+If you need to run linters for specific operating systems, you will need to use the action `>=v2`.
+
+Here is a sample configuration file:
 
 ```yaml
 name: golangci-lint
 on:
   push:
     branches:
-      - master
       - main
+      - master
   pull_request:
 
 permissions:
@@ -102,8 +77,8 @@ jobs:
   golangci:
     strategy:
       matrix:
-        go: ['1.21']
+        go: ['1.22']
-        os: [macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     name: lint
     runs-on: ${{ matrix.os }}
     steps:
@@ -111,29 +86,10 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
-          cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v5
         with:
-          # Require: The version of golangci-lint to use.
+          version: latest
-          # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
-          # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
-          version: v1.54
-
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-
-          # Optional: golangci-lint command line arguments.
-          # 
-          # Note: by default the `.golangci.yml` file should be at the root of the repository.
-          # The location of the configuration file can be changed by using `--config=`
-          # args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0
-
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true
-
-          # Optional:The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
-          # install-mode: "goinstall"
 ```
 
 You will also likely need to add the following `.gitattributes` file to ensure that line endings for Windows builds are properly formatted:
@@ -142,16 +98,106 @@ You will also likely need to add the following `.gitattributes` file to ensure t
 *.go text eol=lf
 ```
 
-## Comments and Annotations
+## Options
+
+`version`: (required) The version of golangci-lint to use.
+* When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
+* When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
+
+```yml
+uses: golangci/golangci-lint-action@v5
+with:
+  version: latest
+  # ...
+```
+
+`install-mode`: (optional) The mode to install golangci-lint.
+It can be `binary` or `goinstall`.
+The default value is `binary`.
+
+```yml
+uses: golangci/golangci-lint-action@v5
+with:
+  install-mode: "goinstall"
+  # ...
+```
+
+`only-new-issues`: (optional) Show only new issues.
+If you are using `merge_group` event (merge queue) you should add the option `fetch-depth: 0` to `actions/checkout` step.
+The default value is `false`.
+
+```yml
+uses: golangci/golangci-lint-action@v5
+with:
+  only-new-issues: true
+  # ...
+```
+
+`working-directory`: (optional) working directory, useful for monorepos.
+
+```yml
+uses: golangci/golangci-lint-action@v5
+with:
+  working-directory: somedir
+  # ...
+```
+
+`skip-cache`: (optional) If set to `true`, then all caching functionality will be completely disabled,
+takes precedence over all other caching options.
+The default value is `false`.
+
+```yml
+uses: golangci/golangci-lint-action@v5
+with:
+  skip-cache: true
+  # ...
+```
+
+`skip-save-cache`: (optional) If set to `true`, caches will not be saved, but they may still be restored, required `skip-cache: false`.
+The default value is `false`.
+
+```yml
+uses: golangci/golangci-lint-action@v5
+with:
+  skip-save-cache: true
+  # ...
+```
+
+`annotations`: (optional) To enable/disable GitHub Action annotations.
+If disabled (`false`), the output format(s) will follow the golangci-lint configuration file and use the same default as golangci-lint (i.e. `colored-line-number`).
+https://golangci-lint.run/usage/configuration/#output-configuration
+The default value is `true`.
+
+```yml
+uses: golangci/golangci-lint-action@v5
+with:
+  annotations: false
+  # ...
+```
+
+`args`: (optional) golangci-lint command line arguments.
+Note: By default, the `.golangci.yml` file should be at the root of the repository.
+The location of the configuration file can be changed by using `--config=`
+
+```yml
+uses: golangci/golangci-lint-action@v5
+with:
+  args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0
+  # ...
+```
+
+## Annotations
 
 Currently, GitHub parses the action's output and creates [annotations](https://github.blog/2018-12-14-introducing-check-runs-and-annotations/).
 
 The restrictions of annotations are the following:
 
-1. Currently, they don't support markdown formatting (see the [feature request](https://github.community/t5/GitHub-API-Development-and/Checks-Ability-to-include-Markdown-in-line-annotations/m-p/56704))
+1. Currently, they don't support Markdown formatting (see the [feature request](https://github.community/t5/GitHub-API-Development-and/Checks-Ability-to-include-Markdown-in-line-annotations/m-p/56704))
-2. They aren't shown in the list of comments like it was with [golangci.com](https://golangci.com). If you would like to have comments - please, up-vote [the issue](https://github.com/golangci/golangci-lint-action/issues/5).
+2. They aren't shown in the list of comments.
+   If you would like to have comments - please, up-vote [the issue](https://github.com/golangci/golangci-lint-action/issues/5).
+3. The number of annotations is [limited](https://github.com/actions/toolkit/blob/main/docs/problem-matchers.md#limitations).
 
-To enable annotations, you need to add the `checks' permission to your action.
+To enable annotations, you need to add the `checks` permission to your action.
 
 ```yaml annotate
 permissions:
@@ -159,7 +205,7 @@ permissions:
   contents: read
   # Optional: allow read access to pull request. Use with `only-new-issues` option.
   pull-requests: read
-  # Optional: Allow write access to checks to allow the action to annotate code in the PR.
+  # Optional: allow write access to checks to allow the action to annotate code in the PR.
   checks: write
 ```
 
@@ -167,9 +213,9 @@ permissions:
 
 The action was implemented with performance in mind:
 
-1. We cache data by [@actions/cache](https://github.com/actions/toolkit/tree/master/packages/cache) between builds: Go build cache, Go modules cache, golangci-lint analysis cache.
+1. We cache data from golangci-lint analysis between builds by using [@actions/cache](https://github.com/actions/toolkit/tree/master/packages/cache). 
 2. We don't use Docker because image pulling is slow.
-3. We do as much as we can in parallel, e.g. we download cache, go, and golangci-lint binary in parallel.
+3. We do as much as we can in parallel, e.g. we download cache, and golangci-lint binary in parallel.
 
 For example, in a repository of [golangci-lint](https://github.com/golangci/golangci-lint) running this action without the cache takes 50s, but with cache takes 14s:
   * in parallel:
@@ -179,9 +225,10 @@ For example, in a repository of [golangci-lint](https://github.com/golangci/gola
 
 ## Internals
 
-We use JavaScript-based action. We don't use Docker-based action because:
+We use JavaScript-based action.
+We don't use Docker-based action because:
 
-1. docker pulling is slow currently
+1. Docker pulling is slow currently
 2. it's easier to use caching from [@actions/cache](https://github.com/actions/toolkit/tree/master/packages/cache)
 
 We support different platforms, such as `ubuntu`, `macos`, and `windows` with `x32` and `x64` archs.
@@ -190,17 +237,20 @@ Inside our action, we perform 3 steps:
 
 1. Setup environment running in parallel:
    * restore [cache](https://github.com/actions/cache) of previous analyses
-  * fetch [action config](https://github.com/golangci/golangci-lint/blob/master/assets/github-action-config.json) and find the latest `golangci-lint` patch version
+   * fetch [action config](https://github.com/golangci/golangci-lint/blob/master/assets/github-action-config.json) and find the latest `golangci-lint` patch version for needed version
-    for needed version (users of this action can specify only minor version of `golangci-lint`). After that install [golangci-lint](https://github.com/golangci/golangci-lint) using [@actions/tool-cache](https://github.com/actions/toolkit/tree/master/packages/tool-cache)
+     (users of this action can specify only minor version of `golangci-lint`).
+     After that install [golangci-lint](https://github.com/golangci/golangci-lint) using [@actions/tool-cache](https://github.com/actions/toolkit/tree/master/packages/tool-cache)
 2. Run `golangci-lint` with specified by user `args`
 3. Save cache for later builds
 
 ### Caching internals
 
-1. We save and restore the following directories: `~/.cache/golangci-lint`, `~/.cache/go-build`, `~/go/pkg`.
+1. We save and restore the following directory: `~/.cache/golangci-lint`.
-2. The primary caching key looks like `golangci-lint.cache-{interval_number}-{go.mod_hash}`. Interval number ensures that we periodically invalidate
+2. The primary caching key looks like `golangci-lint.cache-{interval_number}-{go.mod_hash}`.
-   our cache (every 7 days). `go.mod` hash ensures that we invalidate the cache early - as soon as dependencies have changed.
+   Interval number ensures that we periodically invalidate our cache (every 7 days).
-3. We use [restore keys](https://help.github.com/en/actions/configuring-and-managing-workflows/caching-dependencies-to-speed-up-workflows#matching-a-cache-key): `golangci-lint.cache-{interval_number}-`. GitHub matches keys by prefix if we have no exact match for the primary cache.
+   `go.mod` hash ensures that we invalidate the cache early - as soon as dependencies have changed.
+3. We use [restore keys](https://help.github.com/en/actions/configuring-and-managing-workflows/caching-dependencies-to-speed-up-workflows#matching-a-cache-key): `golangci-lint.cache-{interval_number}-`. 
+   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.
 

action.yml

@@ -1,4 +1,5 @@
-name: "Run golangci-lint"
+# https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions
+name: "Golangci-lint"
 description: "Official golangci-lint action with line-attached annotations for found issues, caching and parallel execution."
 author: "golangci"
 inputs:
@@ -8,9 +9,9 @@ inputs:
       When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
       When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
     required: false
-  args:
+  install-mode:
-    description: "golangci-lint command line arguments"
+    description: "The mode to install golangci-lint. It can be 'binary' or 'goinstall'."
-    default: ""
+    default: "binary"
     required: false
   working-directory:
     description: "golangci-lint working directory, default is project root"
@@ -29,17 +30,19 @@ inputs:
       takes precedence over all other caching options.
     default: 'false'
     required: false
-  skip-pkg-cache:
+  skip-save-cache:
-    description: "if set to true then the action doesn't cache or restore ~/go/pkg."
+    description: |
+      if set to true then the action will not save any caches, but it may still
+      restore existing caches, subject to other options.
     default: 'false'
     required: false
-  skip-build-cache:
+  annotations:
-    description: "if set to true then the action doesn't cache or restore ~/.cache/go-build."
+    description: "To Enable/disable GitHub Action annotations"
-    default: 'false'
+    default: 'true'
     required: false
-  install-mode:
+  args:
-    description: "The mode to install golangci-lint. It can be 'binary' or 'goinstall'."
+    description: "golangci-lint command line arguments"
-    default: "binary"
+    default: ""
     required: false
 runs:
   using: "node20"
@@ -47,4 +50,4 @@ runs:
   post: "dist/post_run/index.js"
 branding:
   icon: "shield"
-  color: "yellow"
+  color: "white"

dist/post_run/index.js

@@ -88813,25 +88813,6 @@ const pathExists = async (path) => !!(await fs.promises.stat(path).catch(() => f
 const getLintCacheDir = () => {
     return path_1.default.resolve(`${process.env.HOME}/.cache/golangci-lint`);
 };
-const getCacheDirs = () => {
-    // Not existing dirs are ok here: it works.
-    const skipPkgCache = core.getInput(`skip-pkg-cache`, { required: true }).trim();
-    const skipBuildCache = core.getInput(`skip-build-cache`, { required: true }).trim();
-    const dirs = [getLintCacheDir()];
-    if (skipBuildCache.toLowerCase() == "true") {
-        core.info(`Omitting ~/.cache/go-build from cache directories`);
-    }
-    else {
-        dirs.push(path_1.default.resolve(`${process.env.HOME}/.cache/go-build`));
-    }
-    if (skipPkgCache.toLowerCase() == "true") {
-        core.info(`Omitting ~/go/pkg from cache directories`);
-    }
-    else {
-        dirs.push(path_1.default.resolve(`${process.env.HOME}/go/pkg`));
-    }
-    return dirs;
-};
 const getIntervalKey = (invalidationIntervalDays) => {
     const now = new Date();
     const secondsSinceEpoch = now.getTime() / 1000;
@@ -88878,7 +88859,7 @@ async function restoreCache() {
     }
     core.saveState(constants_1.State.CachePrimaryKey, primaryKey);
     try {
-        const cacheKey = await cache.restoreCache(getCacheDirs(), primaryKey, restoreKeys);
+        const cacheKey = await cache.restoreCache([getLintCacheDir()], primaryKey, restoreKeys);
         if (!cacheKey) {
             core.info(`Cache not found for input keys: ${[primaryKey, ...restoreKeys].join(", ")}`);
             return;
@@ -88900,13 +88881,15 @@ exports.restoreCache = restoreCache;
 async function saveCache() {
     if (core.getInput(`skip-cache`, { required: true }).trim() == "true")
         return;
+    if (core.getInput(`skip-save-cache`, { required: true }).trim() == "true")
+        return;
     // Validate inputs, this can cause task failure
     if (!utils.isValidEvent()) {
         utils.logWarning(`Event Validation Error: The event type ${process.env[constants_1.Events.Key]} is not supported because it's not tied to a branch or tag ref.`);
         return;
     }
     const startedAt = Date.now();
-    const cacheDirs = getCacheDirs();
+    const cacheDirs = [getLintCacheDir()];
     const primaryKey = core.getState(constants_1.State.CachePrimaryKey);
     if (!primaryKey) {
         utils.logWarning(`Error retrieving key from state.`);
@@ -89163,26 +89146,40 @@ const version_1 = __nccwpck_require__(1946);
 const execShellCommand = (0, util_1.promisify)(child_process_1.exec);
 const writeFile = (0, util_1.promisify)(fs.writeFile);
 const createTempDir = (0, util_1.promisify)(tmp_1.dir);
+function isOnlyNewIssues() {
+    const onlyNewIssues = core.getInput(`only-new-issues`, { required: true }).trim();
+    if (onlyNewIssues !== `false` && onlyNewIssues !== `true`) {
+        throw new Error(`invalid value of "only-new-issues": "${onlyNewIssues}", expected "true" or "false"`);
+    }
+    return onlyNewIssues === `true`;
+}
 async function prepareLint() {
     const mode = core.getInput("install-mode").toLowerCase();
     const versionConfig = await (0, version_1.findLintVersion)(mode);
     return await (0, install_1.installLint)(versionConfig, mode);
 }
 async function fetchPatch() {
-    const onlyNewIssues = core.getInput(`only-new-issues`, { required: true }).trim();
+    if (!isOnlyNewIssues()) {
-    if (onlyNewIssues !== `false` && onlyNewIssues !== `true`) {
-        throw new Error(`invalid value of "only-new-issues": "${onlyNewIssues}", expected "true" or "false"`);
-    }
-    if (onlyNewIssues === `false`) {
         return ``;
     }
     const ctx = github.context;
-    if (ctx.eventName !== `pull_request`) {
+    switch (ctx.eventName) {
+        case `pull_request`:
+        case `pull_request_target`:
+            return await fetchPullRequestPatch(ctx);
+        case `push`:
+            return await fetchPushPatch(ctx);
+        case `merge_group`:
+            core.info(JSON.stringify(ctx.payload));
+            return ``;
+        default:
             core.info(`Not fetching patch for showing only new issues because it's not a pull request context: event name is ${ctx.eventName}`);
             return ``;
     }
-    const pull = ctx.payload.pull_request;
+}
-    if (!pull) {
+async function fetchPullRequestPatch(ctx) {
+    const pr = ctx.payload.pull_request;
+    if (!pr) {
         core.warning(`No pull request in context`);
         return ``;
     }
@@ -89192,7 +89189,7 @@ async function fetchPatch() {
         const patchResp = await octokit.rest.pulls.get({
             owner: ctx.repo.owner,
             repo: ctx.repo.repo,
-            [`pull_number`]: pull.number,
+            [`pull_number`]: pr.number,
             mediaType: {
                 format: `diff`,
             },
@@ -89220,14 +89217,48 @@ async function fetchPatch() {
         return ``; // don't fail the action, but analyze without patch
     }
 }
+async function fetchPushPatch(ctx) {
+    const octokit = github.getOctokit(core.getInput(`github-token`, { required: true }));
+    let patch;
+    try {
+        const patchResp = await octokit.rest.repos.compareCommits({
+            owner: ctx.repo.owner,
+            repo: ctx.repo.repo,
+            base: ctx.payload.before,
+            head: ctx.payload.after,
+            mediaType: {
+                format: `diff`,
+            },
+        });
+        if (patchResp.status !== 200) {
+            core.warning(`failed to fetch push patch: response status is ${patchResp.status}`);
+            return ``; // don't fail the action, but analyze without patch
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        patch = patchResp.data;
+    }
+    catch (err) {
+        console.warn(`failed to fetch push patch:`, err);
+        return ``; // don't fail the action, but analyze without patch
+    }
+    try {
+        const tempDir = await createTempDir();
+        const patchPath = path.join(tempDir, "push.patch");
+        core.info(`Writing patch to ${patchPath}`);
+        await writeFile(patchPath, (0, diffUtils_1.alterDiffPatch)(patch));
+        return patchPath;
+    }
+    catch (err) {
+        console.warn(`failed to save pull request patch:`, err);
+        return ``; // don't fail the action, but analyze without patch
+    }
+}
 async function prepareEnv() {
     const startedAt = Date.now();
     // Prepare cache, lint and go in parallel.
     await (0, cache_1.restoreCache)();
-    const prepareLintPromise = prepareLint();
+    const lintPath = await prepareLint();
-    const patchPromise = fetchPatch();
+    const patchPath = await fetchPatch();
-    const lintPath = await prepareLintPromise;
-    const patchPath = await patchPromise;
     core.info(`Prepared env in ${Date.now() - startedAt}ms`);
     return { lintPath, patchPath };
 }
@@ -89256,6 +89287,8 @@ async function runLint(lintPath, patchPath) {
         .map(([key, value]) => [key.toLowerCase(), value ?? ""]);
     const userArgsMap = new Map(userArgsList);
     const userArgNames = new Set(userArgsList.map(([key]) => key));
+    const annotations = core.getInput(`annotations`).trim() !== "false";
+    if (annotations) {
         const formats = (userArgsMap.get("out-format") || "")
             .trim()
             .split(",")
@@ -89265,15 +89298,34 @@ async function runLint(lintPath, patchPath) {
             .join(",");
         addedArgs.push(`--out-format=${formats}`);
         userArgs = userArgs.replace(/--out-format=\S*/gi, "").trim();
-    if (patchPath) {
+    }
+    if (isOnlyNewIssues()) {
         if (userArgNames.has(`new`) || userArgNames.has(`new-from-rev`) || userArgNames.has(`new-from-patch`)) {
             throw new Error(`please, don't specify manually --new* args when requesting only new issues`);
         }
+        const ctx = github.context;
+        core.info(`only new issues on ${ctx.eventName}: ${patchPath}`);
+        switch (ctx.eventName) {
+            case `pull_request`:
+            case `pull_request_target`:
+            case `push`:
+                if (patchPath) {
                     addedArgs.push(`--new-from-patch=${patchPath}`);
                     // Override config values.
                     addedArgs.push(`--new=false`);
                     addedArgs.push(`--new-from-rev=`);
                 }
+                break;
+            case `merge_group`:
+                addedArgs.push(`--new-from-rev=${ctx.payload.merge_group.base_sha}`);
+                // Override config values.
+                addedArgs.push(`--new=false`);
+                addedArgs.push(`--new-from-patch=`);
+                break;
+            default:
+                break;
+        }
+    }
     const workingDirectory = core.getInput(`working-directory`);
     const cmdArgs = {};
     if (workingDirectory) {

dist/run/index.js

@@ -88813,25 +88813,6 @@ const pathExists = async (path) => !!(await fs.promises.stat(path).catch(() => f
 const getLintCacheDir = () => {
     return path_1.default.resolve(`${process.env.HOME}/.cache/golangci-lint`);
 };
-const getCacheDirs = () => {
-    // Not existing dirs are ok here: it works.
-    const skipPkgCache = core.getInput(`skip-pkg-cache`, { required: true }).trim();
-    const skipBuildCache = core.getInput(`skip-build-cache`, { required: true }).trim();
-    const dirs = [getLintCacheDir()];
-    if (skipBuildCache.toLowerCase() == "true") {
-        core.info(`Omitting ~/.cache/go-build from cache directories`);
-    }
-    else {
-        dirs.push(path_1.default.resolve(`${process.env.HOME}/.cache/go-build`));
-    }
-    if (skipPkgCache.toLowerCase() == "true") {
-        core.info(`Omitting ~/go/pkg from cache directories`);
-    }
-    else {
-        dirs.push(path_1.default.resolve(`${process.env.HOME}/go/pkg`));
-    }
-    return dirs;
-};
 const getIntervalKey = (invalidationIntervalDays) => {
     const now = new Date();
     const secondsSinceEpoch = now.getTime() / 1000;
@@ -88878,7 +88859,7 @@ async function restoreCache() {
     }
     core.saveState(constants_1.State.CachePrimaryKey, primaryKey);
     try {
-        const cacheKey = await cache.restoreCache(getCacheDirs(), primaryKey, restoreKeys);
+        const cacheKey = await cache.restoreCache([getLintCacheDir()], primaryKey, restoreKeys);
         if (!cacheKey) {
             core.info(`Cache not found for input keys: ${[primaryKey, ...restoreKeys].join(", ")}`);
             return;
@@ -88900,13 +88881,15 @@ exports.restoreCache = restoreCache;
 async function saveCache() {
     if (core.getInput(`skip-cache`, { required: true }).trim() == "true")
         return;
+    if (core.getInput(`skip-save-cache`, { required: true }).trim() == "true")
+        return;
     // Validate inputs, this can cause task failure
     if (!utils.isValidEvent()) {
         utils.logWarning(`Event Validation Error: The event type ${process.env[constants_1.Events.Key]} is not supported because it's not tied to a branch or tag ref.`);
         return;
     }
     const startedAt = Date.now();
-    const cacheDirs = getCacheDirs();
+    const cacheDirs = [getLintCacheDir()];
     const primaryKey = core.getState(constants_1.State.CachePrimaryKey);
     if (!primaryKey) {
         utils.logWarning(`Error retrieving key from state.`);
@@ -89163,26 +89146,40 @@ const version_1 = __nccwpck_require__(1946);
 const execShellCommand = (0, util_1.promisify)(child_process_1.exec);
 const writeFile = (0, util_1.promisify)(fs.writeFile);
 const createTempDir = (0, util_1.promisify)(tmp_1.dir);
+function isOnlyNewIssues() {
+    const onlyNewIssues = core.getInput(`only-new-issues`, { required: true }).trim();
+    if (onlyNewIssues !== `false` && onlyNewIssues !== `true`) {
+        throw new Error(`invalid value of "only-new-issues": "${onlyNewIssues}", expected "true" or "false"`);
+    }
+    return onlyNewIssues === `true`;
+}
 async function prepareLint() {
     const mode = core.getInput("install-mode").toLowerCase();
     const versionConfig = await (0, version_1.findLintVersion)(mode);
     return await (0, install_1.installLint)(versionConfig, mode);
 }
 async function fetchPatch() {
-    const onlyNewIssues = core.getInput(`only-new-issues`, { required: true }).trim();
+    if (!isOnlyNewIssues()) {
-    if (onlyNewIssues !== `false` && onlyNewIssues !== `true`) {
-        throw new Error(`invalid value of "only-new-issues": "${onlyNewIssues}", expected "true" or "false"`);
-    }
-    if (onlyNewIssues === `false`) {
         return ``;
     }
     const ctx = github.context;
-    if (ctx.eventName !== `pull_request`) {
+    switch (ctx.eventName) {
+        case `pull_request`:
+        case `pull_request_target`:
+            return await fetchPullRequestPatch(ctx);
+        case `push`:
+            return await fetchPushPatch(ctx);
+        case `merge_group`:
+            core.info(JSON.stringify(ctx.payload));
+            return ``;
+        default:
             core.info(`Not fetching patch for showing only new issues because it's not a pull request context: event name is ${ctx.eventName}`);
             return ``;
     }
-    const pull = ctx.payload.pull_request;
+}
-    if (!pull) {
+async function fetchPullRequestPatch(ctx) {
+    const pr = ctx.payload.pull_request;
+    if (!pr) {
         core.warning(`No pull request in context`);
         return ``;
     }
@@ -89192,7 +89189,7 @@ async function fetchPatch() {
         const patchResp = await octokit.rest.pulls.get({
             owner: ctx.repo.owner,
             repo: ctx.repo.repo,
-            [`pull_number`]: pull.number,
+            [`pull_number`]: pr.number,
             mediaType: {
                 format: `diff`,
             },
@@ -89220,14 +89217,48 @@ async function fetchPatch() {
         return ``; // don't fail the action, but analyze without patch
     }
 }
+async function fetchPushPatch(ctx) {
+    const octokit = github.getOctokit(core.getInput(`github-token`, { required: true }));
+    let patch;
+    try {
+        const patchResp = await octokit.rest.repos.compareCommits({
+            owner: ctx.repo.owner,
+            repo: ctx.repo.repo,
+            base: ctx.payload.before,
+            head: ctx.payload.after,
+            mediaType: {
+                format: `diff`,
+            },
+        });
+        if (patchResp.status !== 200) {
+            core.warning(`failed to fetch push patch: response status is ${patchResp.status}`);
+            return ``; // don't fail the action, but analyze without patch
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        patch = patchResp.data;
+    }
+    catch (err) {
+        console.warn(`failed to fetch push patch:`, err);
+        return ``; // don't fail the action, but analyze without patch
+    }
+    try {
+        const tempDir = await createTempDir();
+        const patchPath = path.join(tempDir, "push.patch");
+        core.info(`Writing patch to ${patchPath}`);
+        await writeFile(patchPath, (0, diffUtils_1.alterDiffPatch)(patch));
+        return patchPath;
+    }
+    catch (err) {
+        console.warn(`failed to save pull request patch:`, err);
+        return ``; // don't fail the action, but analyze without patch
+    }
+}
 async function prepareEnv() {
     const startedAt = Date.now();
     // Prepare cache, lint and go in parallel.
     await (0, cache_1.restoreCache)();
-    const prepareLintPromise = prepareLint();
+    const lintPath = await prepareLint();
-    const patchPromise = fetchPatch();
+    const patchPath = await fetchPatch();
-    const lintPath = await prepareLintPromise;
-    const patchPath = await patchPromise;
     core.info(`Prepared env in ${Date.now() - startedAt}ms`);
     return { lintPath, patchPath };
 }
@@ -89256,6 +89287,8 @@ async function runLint(lintPath, patchPath) {
         .map(([key, value]) => [key.toLowerCase(), value ?? ""]);
     const userArgsMap = new Map(userArgsList);
     const userArgNames = new Set(userArgsList.map(([key]) => key));
+    const annotations = core.getInput(`annotations`).trim() !== "false";
+    if (annotations) {
         const formats = (userArgsMap.get("out-format") || "")
             .trim()
             .split(",")
@@ -89265,15 +89298,34 @@ async function runLint(lintPath, patchPath) {
             .join(",");
         addedArgs.push(`--out-format=${formats}`);
         userArgs = userArgs.replace(/--out-format=\S*/gi, "").trim();
-    if (patchPath) {
+    }
+    if (isOnlyNewIssues()) {
         if (userArgNames.has(`new`) || userArgNames.has(`new-from-rev`) || userArgNames.has(`new-from-patch`)) {
             throw new Error(`please, don't specify manually --new* args when requesting only new issues`);
         }
+        const ctx = github.context;
+        core.info(`only new issues on ${ctx.eventName}: ${patchPath}`);
+        switch (ctx.eventName) {
+            case `pull_request`:
+            case `pull_request_target`:
+            case `push`:
+                if (patchPath) {
                     addedArgs.push(`--new-from-patch=${patchPath}`);
                     // Override config values.
                     addedArgs.push(`--new=false`);
                     addedArgs.push(`--new-from-rev=`);
                 }
+                break;
+            case `merge_group`:
+                addedArgs.push(`--new-from-rev=${ctx.payload.merge_group.base_sha}`);
+                // Override config values.
+                addedArgs.push(`--new=false`);
+                addedArgs.push(`--new-from-patch=`);
+                break;
+            default:
+                break;
+        }
+    }
     const workingDirectory = core.getInput(`working-directory`);
     const cmdArgs = {};
     if (workingDirectory) {

package-lock.json

@@ -21,8 +21,8 @@
         "tmp": "^0.2.3"
       },
       "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^7.7.0",
+        "@typescript-eslint/eslint-plugin": "^7.7.1",
-        "@typescript-eslint/parser": "^7.7.0",
+        "@typescript-eslint/parser": "^7.7.1",
         "@vercel/ncc": "^0.38.1",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
@@ -691,16 +691,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.1.tgz",
-      "integrity": "sha512-GJWR0YnfrKnsRoluVO3PRb9r5aMZriiMMM/RHj5nnTrBy1/wIgk76XCtCKcnXGjpZQJQRFtGV9/0JJ6n30uwpQ==",
+      "integrity": "sha512-KwfdWXJBOviaBVhxO3p5TJiLpNuh2iyXyjmWN0f1nU87pwyvfS0EmjC6ukQVYVFJd/K1+0NWGPDXiyEyQorn0Q==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.7.0",
+        "@typescript-eslint/scope-manager": "7.7.1",
-        "@typescript-eslint/type-utils": "7.7.0",
+        "@typescript-eslint/type-utils": "7.7.1",
-        "@typescript-eslint/utils": "7.7.0",
+        "@typescript-eslint/utils": "7.7.1",
-        "@typescript-eslint/visitor-keys": "7.7.0",
+        "@typescript-eslint/visitor-keys": "7.7.1",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
@@ -741,15 +741,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.7.1.tgz",
-      "integrity": "sha512-fNcDm3wSwVM8QYL4HKVBggdIPAy9Q41vcvC/GtDobw3c4ndVT3K6cqudUmjHPw8EAp4ufax0o58/xvWaP2FmTg==",
+      "integrity": "sha512-vmPzBOOtz48F6JAGVS/kZYk4EkXao6iGrD838sp1w3NQQC0W8ry/q641KU4PrG7AKNAf56NOcR8GOpH8l9FPCw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.7.0",
+        "@typescript-eslint/scope-manager": "7.7.1",
-        "@typescript-eslint/types": "7.7.0",
+        "@typescript-eslint/types": "7.7.1",
-        "@typescript-eslint/typescript-estree": "7.7.0",
+        "@typescript-eslint/typescript-estree": "7.7.1",
-        "@typescript-eslint/visitor-keys": "7.7.0",
+        "@typescript-eslint/visitor-keys": "7.7.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -769,13 +769,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.7.1.tgz",
-      "integrity": "sha512-/8INDn0YLInbe9Wt7dK4cXLDYp0fNHP5xKLHvZl3mOT5X17rK/YShXaiNmorl+/U4VKCVIjJnx4Ri5b0y+HClw==",
+      "integrity": "sha512-PytBif2SF+9SpEUKynYn5g1RHFddJUcyynGpztX3l/ik7KmZEv19WCMhUBkHXPU9es/VWGD3/zg3wg90+Dh2rA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.7.0",
+        "@typescript-eslint/types": "7.7.1",
-        "@typescript-eslint/visitor-keys": "7.7.0"
+        "@typescript-eslint/visitor-keys": "7.7.1"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -786,13 +786,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.7.1.tgz",
-      "integrity": "sha512-bOp3ejoRYrhAlnT/bozNQi3nio9tIgv3U5C0mVDdZC7cpcQEDZXvq8inrHYghLVwuNABRqrMW5tzAv88Vy77Sg==",
+      "integrity": "sha512-ZksJLW3WF7o75zaBPScdW1Gbkwhd/lyeXGf1kQCxJaOeITscoSl0MjynVvCzuV5boUz/3fOI06Lz8La55mu29Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.7.0",
+        "@typescript-eslint/typescript-estree": "7.7.1",
-        "@typescript-eslint/utils": "7.7.0",
+        "@typescript-eslint/utils": "7.7.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -813,9 +813,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.7.1.tgz",
-      "integrity": "sha512-G01YPZ1Bd2hn+KPpIbrAhEWOn5lQBrjxkzHkWvP6NucMXFtfXoevK82hzQdpfuQYuhkvFDeQYbzXCjR1z9Z03w==",
+      "integrity": "sha512-AmPmnGW1ZLTpWa+/2omPrPfR7BcbUU4oha5VIbSbS1a1Tv966bklvLNXxp3mrbc+P2j4MNOTfDffNsk4o0c6/w==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -826,13 +826,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.1.tgz",
-      "integrity": "sha512-8p71HQPE6CbxIBy2kWHqM1KGrC07pk6RJn40n0DSc6bMOBBREZxSDJ+BmRzc8B5OdaMh1ty3mkuWRg4sCFiDQQ==",
+      "integrity": "sha512-CXe0JHCXru8Fa36dteXqmH2YxngKJjkQLjxzoj6LYwzZ7qZvgsLSc+eqItCrqIop8Vl2UKoAi0StVWu97FQZIQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.7.0",
+        "@typescript-eslint/types": "7.7.1",
-        "@typescript-eslint/visitor-keys": "7.7.0",
+        "@typescript-eslint/visitor-keys": "7.7.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -893,17 +893,17 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.7.1.tgz",
-      "integrity": "sha512-LKGAXMPQs8U/zMRFXDZOzmMKgFv3COlxUQ+2NMPhbqgVm6R1w+nU1i4836Pmxu9jZAuIeyySNrN/6Rc657ggig==",
+      "integrity": "sha512-QUvBxPEaBXf41ZBbaidKICgVL8Hin0p6prQDu6bbetWo39BKbWJxRsErOzMNT1rXvTll+J7ChrbmMCXM9rsvOQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.15",
         "@types/semver": "^7.5.8",
-        "@typescript-eslint/scope-manager": "7.7.0",
+        "@typescript-eslint/scope-manager": "7.7.1",
-        "@typescript-eslint/types": "7.7.0",
+        "@typescript-eslint/types": "7.7.1",
-        "@typescript-eslint/typescript-estree": "7.7.0",
+        "@typescript-eslint/typescript-estree": "7.7.1",
         "semver": "^7.6.0"
       },
       "engines": {
@@ -933,12 +933,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.1.tgz",
-      "integrity": "sha512-h0WHOj8MhdhY8YWkzIF30R379y0NqyOHExI9N9KCzvmu05EgG4FumeYa3ccfKUSphyWkWQE1ybVrgz/Pbam6YA==",
+      "integrity": "sha512-gBL3Eq25uADw1LQ9kVpf3hRM+DWzs0uZknHYK3hq4jcTPqVCClHGDnB6UUUV2SFeBeA4KWHWbbLqmbGcZ4FYbw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.7.0",
+        "@typescript-eslint/types": "7.7.1",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -4610,16 +4610,16 @@
       }
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.1.tgz",
-      "integrity": "sha512-GJWR0YnfrKnsRoluVO3PRb9r5aMZriiMMM/RHj5nnTrBy1/wIgk76XCtCKcnXGjpZQJQRFtGV9/0JJ6n30uwpQ==",
+      "integrity": "sha512-KwfdWXJBOviaBVhxO3p5TJiLpNuh2iyXyjmWN0f1nU87pwyvfS0EmjC6ukQVYVFJd/K1+0NWGPDXiyEyQorn0Q==",
       "dev": true,
       "requires": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.7.0",
+        "@typescript-eslint/scope-manager": "7.7.1",
-        "@typescript-eslint/type-utils": "7.7.0",
+        "@typescript-eslint/type-utils": "7.7.1",
-        "@typescript-eslint/utils": "7.7.0",
+        "@typescript-eslint/utils": "7.7.1",
-        "@typescript-eslint/visitor-keys": "7.7.0",
+        "@typescript-eslint/visitor-keys": "7.7.1",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
@@ -4640,54 +4640,54 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.7.1.tgz",
-      "integrity": "sha512-fNcDm3wSwVM8QYL4HKVBggdIPAy9Q41vcvC/GtDobw3c4ndVT3K6cqudUmjHPw8EAp4ufax0o58/xvWaP2FmTg==",
+      "integrity": "sha512-vmPzBOOtz48F6JAGVS/kZYk4EkXao6iGrD838sp1w3NQQC0W8ry/q641KU4PrG7AKNAf56NOcR8GOpH8l9FPCw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "7.7.0",
+        "@typescript-eslint/scope-manager": "7.7.1",
-        "@typescript-eslint/types": "7.7.0",
+        "@typescript-eslint/types": "7.7.1",
-        "@typescript-eslint/typescript-estree": "7.7.0",
+        "@typescript-eslint/typescript-estree": "7.7.1",
-        "@typescript-eslint/visitor-keys": "7.7.0",
+        "@typescript-eslint/visitor-keys": "7.7.1",
         "debug": "^4.3.4"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.7.1.tgz",
-      "integrity": "sha512-/8INDn0YLInbe9Wt7dK4cXLDYp0fNHP5xKLHvZl3mOT5X17rK/YShXaiNmorl+/U4VKCVIjJnx4Ri5b0y+HClw==",
+      "integrity": "sha512-PytBif2SF+9SpEUKynYn5g1RHFddJUcyynGpztX3l/ik7KmZEv19WCMhUBkHXPU9es/VWGD3/zg3wg90+Dh2rA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "7.7.0",
+        "@typescript-eslint/types": "7.7.1",
-        "@typescript-eslint/visitor-keys": "7.7.0"
+        "@typescript-eslint/visitor-keys": "7.7.1"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.7.1.tgz",
-      "integrity": "sha512-bOp3ejoRYrhAlnT/bozNQi3nio9tIgv3U5C0mVDdZC7cpcQEDZXvq8inrHYghLVwuNABRqrMW5tzAv88Vy77Sg==",
+      "integrity": "sha512-ZksJLW3WF7o75zaBPScdW1Gbkwhd/lyeXGf1kQCxJaOeITscoSl0MjynVvCzuV5boUz/3fOI06Lz8La55mu29Q==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "7.7.0",
+        "@typescript-eslint/typescript-estree": "7.7.1",
-        "@typescript-eslint/utils": "7.7.0",
+        "@typescript-eslint/utils": "7.7.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.7.1.tgz",
-      "integrity": "sha512-G01YPZ1Bd2hn+KPpIbrAhEWOn5lQBrjxkzHkWvP6NucMXFtfXoevK82hzQdpfuQYuhkvFDeQYbzXCjR1z9Z03w==",
+      "integrity": "sha512-AmPmnGW1ZLTpWa+/2omPrPfR7BcbUU4oha5VIbSbS1a1Tv966bklvLNXxp3mrbc+P2j4MNOTfDffNsk4o0c6/w==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.1.tgz",
-      "integrity": "sha512-8p71HQPE6CbxIBy2kWHqM1KGrC07pk6RJn40n0DSc6bMOBBREZxSDJ+BmRzc8B5OdaMh1ty3mkuWRg4sCFiDQQ==",
+      "integrity": "sha512-CXe0JHCXru8Fa36dteXqmH2YxngKJjkQLjxzoj6LYwzZ7qZvgsLSc+eqItCrqIop8Vl2UKoAi0StVWu97FQZIQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "7.7.0",
+        "@typescript-eslint/types": "7.7.1",
-        "@typescript-eslint/visitor-keys": "7.7.0",
+        "@typescript-eslint/visitor-keys": "7.7.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -4726,17 +4726,17 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.7.1.tgz",
-      "integrity": "sha512-LKGAXMPQs8U/zMRFXDZOzmMKgFv3COlxUQ+2NMPhbqgVm6R1w+nU1i4836Pmxu9jZAuIeyySNrN/6Rc657ggig==",
+      "integrity": "sha512-QUvBxPEaBXf41ZBbaidKICgVL8Hin0p6prQDu6bbetWo39BKbWJxRsErOzMNT1rXvTll+J7ChrbmMCXM9rsvOQ==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.15",
         "@types/semver": "^7.5.8",
-        "@typescript-eslint/scope-manager": "7.7.0",
+        "@typescript-eslint/scope-manager": "7.7.1",
-        "@typescript-eslint/types": "7.7.0",
+        "@typescript-eslint/types": "7.7.1",
-        "@typescript-eslint/typescript-estree": "7.7.0",
+        "@typescript-eslint/typescript-estree": "7.7.1",
         "semver": "^7.6.0"
       },
       "dependencies": {
@@ -4752,12 +4752,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "7.7.0",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.1.tgz",
-      "integrity": "sha512-h0WHOj8MhdhY8YWkzIF30R379y0NqyOHExI9N9KCzvmu05EgG4FumeYa3ccfKUSphyWkWQE1ybVrgz/Pbam6YA==",
+      "integrity": "sha512-gBL3Eq25uADw1LQ9kVpf3hRM+DWzs0uZknHYK3hq4jcTPqVCClHGDnB6UUUV2SFeBeA4KWHWbbLqmbGcZ4FYbw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "7.7.0",
+        "@typescript-eslint/types": "7.7.1",
         "eslint-visitor-keys": "^3.4.3"
       }
     },

package.json

@@ -36,8 +36,8 @@
     "tmp": "^0.2.3"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^7.7.0",
+    "@typescript-eslint/eslint-plugin": "^7.7.1",
-    "@typescript-eslint/parser": "^7.7.0",
+    "@typescript-eslint/parser": "^7.7.1",
     "@vercel/ncc": "^0.38.1",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",

src/cache.ts

@@ -23,26 +23,6 @@ const getLintCacheDir = (): string => {
   return path.resolve(`${process.env.HOME}/.cache/golangci-lint`)
 }
 
-const getCacheDirs = (): string[] => {
-  // Not existing dirs are ok here: it works.
-  const skipPkgCache = core.getInput(`skip-pkg-cache`, { required: true }).trim()
-  const skipBuildCache = core.getInput(`skip-build-cache`, { required: true }).trim()
-  const dirs = [getLintCacheDir()]
-
-  if (skipBuildCache.toLowerCase() == "true") {
-    core.info(`Omitting ~/.cache/go-build from cache directories`)
-  } else {
-    dirs.push(path.resolve(`${process.env.HOME}/.cache/go-build`))
-  }
-  if (skipPkgCache.toLowerCase() == "true") {
-    core.info(`Omitting ~/go/pkg from cache directories`)
-  } else {
-    dirs.push(path.resolve(`${process.env.HOME}/go/pkg`))
-  }
-
-  return dirs
-}
-
 const getIntervalKey = (invalidationIntervalDays: number): string => {
   const now = new Date()
   const secondsSinceEpoch = now.getTime() / 1000
@@ -97,7 +77,7 @@ export async function restoreCache(): Promise<void> {
   }
   core.saveState(State.CachePrimaryKey, primaryKey)
   try {
-    const cacheKey = await cache.restoreCache(getCacheDirs(), primaryKey, restoreKeys)
+    const cacheKey = await cache.restoreCache([getLintCacheDir()], primaryKey, restoreKeys)
     if (!cacheKey) {
       core.info(`Cache not found for input keys: ${[primaryKey, ...restoreKeys].join(", ")}`)
       return
@@ -116,6 +96,7 @@ export async function restoreCache(): Promise<void> {
 
 export async function saveCache(): Promise<void> {
   if (core.getInput(`skip-cache`, { required: true }).trim() == "true") return
+  if (core.getInput(`skip-save-cache`, { required: true }).trim() == "true") return
 
   // Validate inputs, this can cause task failure
   if (!utils.isValidEvent()) {
@@ -127,7 +108,7 @@ export async function saveCache(): Promise<void> {
 
   const startedAt = Date.now()
 
-  const cacheDirs = getCacheDirs()
+  const cacheDirs = [getLintCacheDir()]
   const primaryKey = core.getState(State.CachePrimaryKey)
   if (!primaryKey) {
     utils.logWarning(`Error retrieving key from state.`)

src/run.ts

@@ -1,5 +1,6 @@
 import * as core from "@actions/core"
 import * as github from "@actions/github"
+import { Context } from "@actions/github/lib/context"
 import { exec, ExecOptions } from "child_process"
 import * as fs from "fs"
 import * as path from "path"
@@ -15,6 +16,16 @@ const execShellCommand = promisify(exec)
 const writeFile = promisify(fs.writeFile)
 const createTempDir = promisify(dir)
 
+function isOnlyNewIssues(): boolean {
+  const onlyNewIssues = core.getInput(`only-new-issues`, { required: true }).trim()
+
+  if (onlyNewIssues !== `false` && onlyNewIssues !== `true`) {
+    throw new Error(`invalid value of "only-new-issues": "${onlyNewIssues}", expected "true" or "false"`)
+  }
+
+  return onlyNewIssues === `true`
+}
+
 async function prepareLint(): Promise<string> {
   const mode = core.getInput("install-mode").toLowerCase()
   const versionConfig = await findLintVersion(<InstallMode>mode)
@@ -23,31 +34,42 @@ async function prepareLint(): Promise<string> {
 }
 
 async function fetchPatch(): Promise<string> {
-  const onlyNewIssues = core.getInput(`only-new-issues`, { required: true }).trim()
+  if (!isOnlyNewIssues()) {
-  if (onlyNewIssues !== `false` && onlyNewIssues !== `true`) {
-    throw new Error(`invalid value of "only-new-issues": "${onlyNewIssues}", expected "true" or "false"`)
-  }
-  if (onlyNewIssues === `false`) {
     return ``
   }
 
   const ctx = github.context
-  if (ctx.eventName !== `pull_request`) {
+
+  switch (ctx.eventName) {
+    case `pull_request`:
+    case `pull_request_target`:
+      return await fetchPullRequestPatch(ctx)
+    case `push`:
+      return await fetchPushPatch(ctx)
+    case `merge_group`:
+      core.info(JSON.stringify(ctx.payload))
+      return ``
+    default:
       core.info(`Not fetching patch for showing only new issues because it's not a pull request context: event name is ${ctx.eventName}`)
       return ``
   }
-  const pull = ctx.payload.pull_request
+}
-  if (!pull) {
+
+async function fetchPullRequestPatch(ctx: Context): Promise<string> {
+  const pr = ctx.payload.pull_request
+  if (!pr) {
     core.warning(`No pull request in context`)
     return ``
   }
+
   const octokit = github.getOctokit(core.getInput(`github-token`, { required: true }))
+
   let patch: string
   try {
     const patchResp = await octokit.rest.pulls.get({
       owner: ctx.repo.owner,
       repo: ctx.repo.repo,
-      [`pull_number`]: pull.number,
+      [`pull_number`]: pr.number,
       mediaType: {
         format: `diff`,
       },
@@ -77,6 +99,45 @@ async function fetchPatch(): Promise<string> {
   }
 }
 
+async function fetchPushPatch(ctx: Context): Promise<string> {
+  const octokit = github.getOctokit(core.getInput(`github-token`, { required: true }))
+
+  let patch: string
+  try {
+    const patchResp = await octokit.rest.repos.compareCommits({
+      owner: ctx.repo.owner,
+      repo: ctx.repo.repo,
+      base: ctx.payload.before,
+      head: ctx.payload.after,
+      mediaType: {
+        format: `diff`,
+      },
+    })
+
+    if (patchResp.status !== 200) {
+      core.warning(`failed to fetch push patch: response status is ${patchResp.status}`)
+      return `` // don't fail the action, but analyze without patch
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    patch = patchResp.data as any
+  } catch (err) {
+    console.warn(`failed to fetch push patch:`, err)
+    return `` // don't fail the action, but analyze without patch
+  }
+
+  try {
+    const tempDir = await createTempDir()
+    const patchPath = path.join(tempDir, "push.patch")
+    core.info(`Writing patch to ${patchPath}`)
+    await writeFile(patchPath, alterDiffPatch(patch))
+    return patchPath
+  } catch (err) {
+    console.warn(`failed to save pull request patch:`, err)
+    return `` // don't fail the action, but analyze without patch
+  }
+}
+
 type Env = {
   lintPath: string
   patchPath: string
@@ -87,11 +148,9 @@ async function prepareEnv(): Promise<Env> {
 
   // Prepare cache, lint and go in parallel.
   await restoreCache()
-  const prepareLintPromise = prepareLint()
-  const patchPromise = fetchPatch()
 
-  const lintPath = await prepareLintPromise
+  const lintPath = await prepareLint()
-  const patchPath = await patchPromise
+  const patchPath = await fetchPatch()
 
   core.info(`Prepared env in ${Date.now() - startedAt}ms`)
 
@@ -133,6 +192,9 @@ async function runLint(lintPath: string, patchPath: string): Promise<void> {
   const userArgsMap = new Map<string, string>(userArgsList)
   const userArgNames = new Set<string>(userArgsList.map(([key]) => key))
 
+  const annotations = core.getInput(`annotations`).trim() !== "false"
+
+  if (annotations) {
     const formats = (userArgsMap.get("out-format") || "")
       .trim()
       .split(",")
@@ -143,17 +205,40 @@ async function runLint(lintPath: string, patchPath: string): Promise<void> {
 
     addedArgs.push(`--out-format=${formats}`)
     userArgs = userArgs.replace(/--out-format=\S*/gi, "").trim()
+  }
 
-  if (patchPath) {
+  if (isOnlyNewIssues()) {
     if (userArgNames.has(`new`) || userArgNames.has(`new-from-rev`) || userArgNames.has(`new-from-patch`)) {
       throw new Error(`please, don't specify manually --new* args when requesting only new issues`)
     }
+
+    const ctx = github.context
+
+    core.info(`only new issues on ${ctx.eventName}: ${patchPath}`)
+
+    switch (ctx.eventName) {
+      case `pull_request`:
+      case `pull_request_target`:
+      case `push`:
+        if (patchPath) {
           addedArgs.push(`--new-from-patch=${patchPath}`)
 
           // Override config values.
           addedArgs.push(`--new=false`)
           addedArgs.push(`--new-from-rev=`)
         }
+        break
+      case `merge_group`:
+        addedArgs.push(`--new-from-rev=${ctx.payload.merge_group.base_sha}`)
+
+        // Override config values.
+        addedArgs.push(`--new=false`)
+        addedArgs.push(`--new-from-patch=`)
+        break
+      default:
+        break
+    }
+  }
 
   const workingDirectory = core.getInput(`working-directory`)
   const cmdArgs: ExecOptions = {}