Merge 8ec3b44912 into 9d7afb8d21

.github/workflows/pull-request-verification.yml

@@ -18,13 +18,6 @@ jobs:
     - run: |
         npm install
         npm run all
-    - name: Check dist is up to date
-      run: |
-        if [ -n "$(git diff --name-only dist/)" ]; then
-          echo "::error::dist/index.js is out of date. Run 'npm run all' and commit the result."
-          git diff --stat dist/
-          exit 1
-        fi
 
   test-inline:
     runs-on: ubuntu-latest

README.md

@@ -27,11 +27,6 @@ don't allow this because they don't work on a level of individual jobs or steps.
   - The `base` input parameter must not be the same as the branch that triggered the workflow
   - Changes are detected against the merge-base with the configured base branch or the default branch
   - Uses git commands to detect changes - repository must be already [checked out](https://github.com/actions/checkout)
-- **[Merge queue](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue):**
-  - Workflow triggered by **[merge_group](https://docs.github.com/en/actions/reference/events-that-trigger-workflows#merge_group)**
-  - The `base` and `ref` input parameters default to commit hashes from the event
-    unless explicitly specified.
-  - Uses git commands to detect changes - repository must be already [checked out](https://github.com/actions/checkout)
 - **Master, Release, or other long-lived branches:**
   - Workflow triggered by **[push](https://docs.github.com/en/actions/reference/events-that-trigger-workflows#push)** event
   when `base` input parameter is the same as the branch that triggered the workflow:
@@ -51,7 +46,7 @@ don't allow this because they don't work on a level of individual jobs or steps.
 ## Example
 
 ```yaml
-- uses: dorny/paths-filter@v4
+- uses: dorny/paths-filter@v3
   id: changes
   with:
     filters: |
@@ -77,7 +72,7 @@ For more scenarios see [examples](#examples) section.
 
 ## What's New
 
-- New major release `v4` after update to Node 24 [Breaking change]
+- New major release `v3` after update to Node 20 [Breaking change]
 - Add `ref` input parameter
 - Add `list-files: csv` format
 - Configure matrix job to run for each folder with changes using `changes` output
@@ -89,7 +84,7 @@ For more information, see [CHANGELOG](https://github.com/dorny/paths-filter/blob
 ## Usage
 
 ```yaml
-- uses: dorny/paths-filter@v4
+- uses: dorny/paths-filter@v3
   with:
     # Defines filters applied to detected changed files.
     # Each filter has a name and a list of rules.
@@ -109,8 +104,6 @@ For more information, see [CHANGELOG](https://github.com/dorny/paths-filter/blob
     # Branch, tag, or commit SHA against which the changes will be detected.
     # If it references the same branch it was pushed to,
     # changes are detected against the most recent commit before the push.
-    # If it is empty and action is triggered by merge_group event,
-    # the base commit in the event will be used.
     # Otherwise, it uses git merge-base to find the best common ancestor between
     # current branch (HEAD) and base.
     # When merge-base is found, it's used for change detection - only changes
@@ -124,8 +117,6 @@ For more information, see [CHANGELOG](https://github.com/dorny/paths-filter/blob
     # Git reference (e.g. branch name) from which the changes will be detected.
     # Useful when workflow can be triggered only on the default branch (e.g. repository_dispatch event)
     # but you want to get changes on a different branch.
-    # If this is empty and action is triggered by merge_group event,
-    # the head commit in the event will be used.
     # This option is ignored if action is triggered by pull_request event.
     # default: ${{ github.ref }}
     ref:
@@ -208,8 +199,8 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
-    - uses: dorny/paths-filter@v4
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
       id: filter
       with:
         filters: |
@@ -253,7 +244,7 @@ jobs:
       frontend: ${{ steps.filter.outputs.frontend }}
     steps:
     # For pull requests it's not necessary to checkout the code
-    - uses: dorny/paths-filter@v4
+    - uses: dorny/paths-filter@v3
       id: filter
       with:
         filters: |
@@ -268,7 +259,7 @@ jobs:
     if: ${{ needs.changes.outputs.backend == 'true' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - ...
 
   # JOB to build and test frontend code
@@ -277,7 +268,7 @@ jobs:
     if: ${{ needs.changes.outputs.frontend == 'true' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - ...
 ```
 
@@ -299,7 +290,7 @@ jobs:
       packages: ${{ steps.filter.outputs.changes }}
     steps:
     # For pull requests it's not necessary to checkout the code
-    - uses: dorny/paths-filter@v4
+    - uses: dorny/paths-filter@v3
       id: filter
       with:
         filters: |
@@ -316,7 +307,7 @@ jobs:
         package: ${{ fromJSON(needs.changes.outputs.packages) }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - ...
 ```
 
@@ -333,12 +324,6 @@ on:
     branches: # PRs to the following branches will trigger the workflow
       - master
       - develop
-  # Optionally you can use the action in the merge queue
-  # if your repository enables the feature.
-  merge_group:
-    branches:
-      - master
-      - develop
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -346,8 +331,8 @@ jobs:
     permissions:
       pull-requests: read
     steps:
-    - uses: actions/checkout@v6
-    - uses: dorny/paths-filter@v4
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
       id: filter
       with:
         filters: ... # Configure your filters
@@ -367,12 +352,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         # This may save additional git fetch roundtrip if
         # merge-base is found within latest 20 commits
         fetch-depth: 20
-    - uses: dorny/paths-filter@v4
+    - uses: dorny/paths-filter@v3
       id: filter
       with:
         base: develop # Change detection against merge-base with this branch
@@ -395,8 +380,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
-    - uses: dorny/paths-filter@v4
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
       id: filter
       with:
         # Use context to get the branch where commits were pushed.
@@ -423,14 +408,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
 
       # Some action that modifies files tracked by git (e.g. code linter)
     - uses: johndoe/some-action@v1
 
       # Filter to detect which files were modified
       # Changes could be, for example, automatically committed
-    - uses: dorny/paths-filter@v4
+    - uses: dorny/paths-filter@v3
       id: filter
       with:
         base: HEAD
@@ -445,7 +430,7 @@ jobs:
   <summary>Define filter rules in own file</summary>
 
 ```yaml
-- uses: dorny/paths-filter@v4
+- uses: dorny/paths-filter@v3
       id: filter
       with:
         # Path to file where filters are defined
@@ -458,7 +443,7 @@ jobs:
   <summary>Use YAML anchors to reuse path expression(s) inside another rule</summary>
 
 ```yaml
-- uses: dorny/paths-filter@v4
+- uses: dorny/paths-filter@v3
       id: filter
       with:
         # &shared is YAML anchor,
@@ -479,7 +464,7 @@ jobs:
   <summary>Consider if file was added, modified or deleted</summary>
 
 ```yaml
-- uses: dorny/paths-filter@v4
+- uses: dorny/paths-filter@v3
       id: filter
       with:
         # Changed file can be 'added', 'modified', or 'deleted'.
@@ -505,7 +490,7 @@ jobs:
   <summary>Detect changes in folder only for some file extensions</summary>
 
 ```yaml
-- uses: dorny/paths-filter@v4
+- uses: dorny/paths-filter@v3
       id: filter
       with:
         # This makes it so that all the patterns have to match a file for it to be
@@ -564,7 +549,7 @@ jobs:
   <summary>Passing list of modified files as command line args in Linux shell</summary>
 
 ```yaml
-- uses: dorny/paths-filter@v4
+- uses: dorny/paths-filter@v3
   id: filter
   with:
     # Enable listing of files matching each filter.
@@ -590,7 +575,7 @@ jobs:
   <summary>Passing list of modified files as JSON array to another action</summary>
 
 ```yaml
-- uses: dorny/paths-filter@v4
+- uses: dorny/paths-filter@v3
   id: filter
   with:
     # Enable listing of files matching each filter.

dist/index.js

@@ -623,49 +623,33 @@ async function getChangedFiles(token, base, ref, initialFetchDepth) {
         }
         return await git.getChangesOnHead();
     }
-    switch (github.context.eventName) {
-        // To keep backward compatibility, commits in GitHub pull request event
-        // take precedence over manual inputs.
-        case 'pull_request':
-        case 'pull_request_review':
-        case 'pull_request_review_comment':
-        case 'pull_request_target': {
-            if (ref) {
-                core.warning(`'ref' input parameter is ignored when action is triggered by pull request event`);
-            }
-            if (base) {
-                core.warning(`'base' input parameter is ignored when action is triggered by pull request event`);
-            }
-            const pr = github.context.payload.pull_request;
-            if (token) {
-                return await getChangedFilesFromApi(token, pr);
-            }
-            if (github.context.eventName === 'pull_request_target') {
-                // pull_request_target is executed in context of base branch and GITHUB_SHA points to last commit in base branch
-                // Therefore it's not possible to look at changes in last commit
-                // At the same time we don't want to fetch any code from forked repository
-                throw new Error(`'token' input parameter is required if action is triggered by 'pull_request_target' event`);
-            }
-            core.info('Github token is not available - changes will be detected using git diff');
-            const baseSha = (_a = github.context.payload.pull_request) === null || _a === void 0 ? void 0 : _a.base.sha;
-            const defaultBranch = (_b = github.context.payload.repository) === null || _b === void 0 ? void 0 : _b.default_branch;
-            const currentRef = await git.getCurrentRef();
-            return await git.getChanges(base || baseSha || defaultBranch, currentRef);
+    const prEvents = ['pull_request', 'pull_request_review', 'pull_request_review_comment', 'pull_request_target'];
+    if (prEvents.includes(github.context.eventName)) {
+        if (ref) {
+            core.warning(`'ref' input parameter is ignored when 'base' is set to HEAD`);
         }
-        // To keep backward compatibility, manual inputs take precedence over
-        // commits in GitHub merge queue event.
-        case 'merge_group': {
-            const mergeGroup = github.context.payload;
-            if (!base) {
-                base = mergeGroup.merge_group.base_sha;
-            }
-            if (!ref) {
-                ref = mergeGroup.merge_group.head_sha;
-            }
-            break;
+        if (base) {
+            core.warning(`'base' input parameter is ignored when action is triggered by pull request event`);
         }
+        const pr = github.context.payload.pull_request;
+        if (token) {
+            return await getChangedFilesFromApi(token, pr);
+        }
+        if (github.context.eventName === 'pull_request_target') {
+            // pull_request_target is executed in context of base branch and GITHUB_SHA points to last commit in base branch
+            // Therefor it's not possible to look at changes in last commit
+            // At the same time we don't want to fetch any code from forked repository
+            throw new Error(`'token' input parameter is required if action is triggered by 'pull_request_target' event`);
+        }
+        core.info('Github token is not available - changes will be detected using git diff');
+        const baseSha = (_a = github.context.payload.pull_request) === null || _a === void 0 ? void 0 : _a.base.sha;
+        const defaultBranch = (_b = github.context.payload.repository) === null || _b === void 0 ? void 0 : _b.default_branch;
+        const currentRef = await git.getCurrentRef();
+        return await git.getChanges(base || baseSha || defaultBranch, currentRef);
+    }
+    else {
+        return getChangedFilesFromGit(base, ref, initialFetchDepth);
     }
-    return getChangedFilesFromGit(base, ref, initialFetchDepth);
 }
 async function getChangedFilesFromGit(base, head, initialFetchDepth) {
     var _a;

src/main.ts

@@ -3,7 +3,7 @@ import * as core from '@actions/core'
 import * as github from '@actions/github'
 import path from 'path'
 import {GetResponseDataTypeFromEndpointMethod} from '@octokit/types'
-import {MergeGroupEvent, PullRequest, PushEvent} from '@octokit/webhooks-types'
+import {PushEvent, PullRequestEvent} from '@octokit/webhooks-types'
 
 import {
   isPredicateQuantifier,
@@ -87,50 +87,32 @@ async function getChangedFiles(token: string, base: string, ref: string, initial
     return await git.getChangesOnHead()
   }
 
-  switch (github.context.eventName) {
-    // To keep backward compatibility, commits in GitHub pull request event
-    // take precedence over manual inputs.
-    case 'pull_request':
-    case 'pull_request_review':
-    case 'pull_request_review_comment':
-    case 'pull_request_target': {
-      if (ref) {
-        core.warning(`'ref' input parameter is ignored when action is triggered by pull request event`)
-      }
-      if (base) {
-        core.warning(`'base' input parameter is ignored when action is triggered by pull request event`)
-      }
-      const pr = github.context.payload.pull_request as PullRequest
-      if (token) {
-        return await getChangedFilesFromApi(token, pr)
-      }
-      if (github.context.eventName === 'pull_request_target') {
-        // pull_request_target is executed in context of base branch and GITHUB_SHA points to last commit in base branch
-        // Therefore it's not possible to look at changes in last commit
-        // At the same time we don't want to fetch any code from forked repository
-        throw new Error(`'token' input parameter is required if action is triggered by 'pull_request_target' event`)
-      }
-      core.info('Github token is not available - changes will be detected using git diff')
-      const baseSha = github.context.payload.pull_request?.base.sha
-      const defaultBranch = github.context.payload.repository?.default_branch
-      const currentRef = await git.getCurrentRef()
-      return await git.getChanges(base || baseSha || defaultBranch, currentRef)
+  const prEvents = ['pull_request', 'pull_request_review', 'pull_request_review_comment', 'pull_request_target']
+  if (prEvents.includes(github.context.eventName)) {
+    if (ref) {
+      core.warning(`'ref' input parameter is ignored when 'base' is set to HEAD`)
     }
-    // To keep backward compatibility, manual inputs take precedence over
-    // commits in GitHub merge queue event.
-    case 'merge_group': {
-      const mergeGroup = github.context.payload as MergeGroupEvent
-      if (!base) {
-        base = mergeGroup.merge_group.base_sha
-      }
-      if (!ref) {
-        ref = mergeGroup.merge_group.head_sha
-      }
-      break
+    if (base) {
+      core.warning(`'base' input parameter is ignored when action is triggered by pull request event`)
     }
+    const pr = github.context.payload.pull_request as PullRequestEvent
+    if (token) {
+      return await getChangedFilesFromApi(token, pr)
+    }
+    if (github.context.eventName === 'pull_request_target') {
+      // pull_request_target is executed in context of base branch and GITHUB_SHA points to last commit in base branch
+      // Therefor it's not possible to look at changes in last commit
+      // At the same time we don't want to fetch any code from forked repository
+      throw new Error(`'token' input parameter is required if action is triggered by 'pull_request_target' event`)
+    }
+    core.info('Github token is not available - changes will be detected using git diff')
+    const baseSha = github.context.payload.pull_request?.base.sha
+    const defaultBranch = github.context.payload.repository?.default_branch
+    const currentRef = await git.getCurrentRef()
+    return await git.getChanges(base || baseSha || defaultBranch, currentRef)
+  } else {
+    return getChangedFilesFromGit(base, ref, initialFetchDepth)
   }
-
-  return getChangedFilesFromGit(base, ref, initialFetchDepth)
 }
 
 async function getChangedFilesFromGit(base: string, head: string, initialFetchDepth: number): Promise<File[]> {
@@ -196,7 +178,7 @@ async function getChangedFilesFromGit(base: string, head: string, initialFetchDe
 }
 
 // Uses github REST api to get list of files changed in PR
-async function getChangedFilesFromApi(token: string, pullRequest: PullRequest): Promise<File[]> {
+async function getChangedFilesFromApi(token: string, pullRequest: PullRequestEvent): Promise<File[]> {
   core.startGroup(`Fetching list of changed files for PR#${pullRequest.number} from Github API`)
   try {
     const client = github.getOctokit(token)