chore(deps): update dependency eslint to v8.46.0 (#1417)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

HISTORY.md

@@ -1,5 +1,58 @@
 # Changelog
 
+# [37.5.0](https://github.com/tj-actions/changed-files/compare/v37.4.0...v37.5.0) - (2023-07-24)
+
+## <!-- 0 -->🚀 Features
+
+- Add support to detect changes for merge group event ([#1404](https://github.com/tj-actions/changed-files/issues/1404)) ([b8e577a](https://github.com/tj-actions/changed-files/commit/b8e577a27496ebc04ffb8b3bbca1b30a145001b1))  - (Tonye Jack)
+
+## <!-- 1 -->🐛 Bug Fixes
+
+- Error fetch more history for release events ([#1403](https://github.com/tj-actions/changed-files/issues/1403)) ([fc3c551](https://github.com/tj-actions/changed-files/commit/fc3c551a67c6151b4b7746c157a9c0914f18e129))  - (Tonye Jack)
+
+## <!-- 26 -->🔄 Update
+
+- Update package.json ([73d266f](https://github.com/tj-actions/changed-files/commit/73d266fe29bbb01958506ffe53b575269d8f2b13))  - (Tonye Jack)
+- Update package.json ([e1ddf02](https://github.com/tj-actions/changed-files/commit/e1ddf02aff6c4d9a624216633291c52df6630421))  - (Tonye Jack)
+- Update README.md ([f543980](https://github.com/tj-actions/changed-files/commit/f5439803c2c02cdb10b325d247c8ccc66cbc2203))  - (Tonye Jack)
+- Update README.md ([a0a0be0](https://github.com/tj-actions/changed-files/commit/a0a0be0376b580745f0bd13a6b7ee4e98d028bf3))  - (Tonye Jack)
+
+## <!-- 7 -->⚙️ Miscellaneous Tasks
+
+- **deps:** Lock file maintenance ([#1406](https://github.com/tj-actions/changed-files/issues/1406)) ([920e7b9](https://github.com/tj-actions/changed-files/commit/920e7b9ae1d45913fc81f86c956fee89c77d2e5e))  - (renovate[bot])
+- **deps:** Update typescript-eslint monorepo to v6.2.0 ([#1402](https://github.com/tj-actions/changed-files/issues/1402)) ([797a722](https://github.com/tj-actions/changed-files/commit/797a7222448d90d32258966774780cfb39ee4f44))  - (renovate[bot])
+- **deps:** Lock file maintenance ([#1401](https://github.com/tj-actions/changed-files/issues/1401)) ([44790ad](https://github.com/tj-actions/changed-files/commit/44790ad9d8b0716d28defa47199281f484931e31))  - (renovate[bot])
+- Update package.json ([66d62c9](https://github.com/tj-actions/changed-files/commit/66d62c97d57b2c770a365925793a1e8eb2b1dcd0))  - (Tonye Jack)
+- **deps:** Update dependency @types/node to v20.4.4 ([#1400](https://github.com/tj-actions/changed-files/issues/1400)) ([d44a61e](https://github.com/tj-actions/changed-files/commit/d44a61ef339541580efca1a47286b8b9e3b69311))  - (renovate[bot])
+- **deps:** Update dependency @types/node to v20.4.3 ([#1399](https://github.com/tj-actions/changed-files/issues/1399)) ([ef59201](https://github.com/tj-actions/changed-files/commit/ef59201f02fa40b09640c053d97cdf5c5dc65391))  - (renovate[bot])
+
+## <!-- 9 -->⬆️ Upgrades
+
+- Upgraded to v37.4.0 ([#1397](https://github.com/tj-actions/changed-files/issues/1397))
+
+Co-authored-by: jackton1 <jackton1@users.noreply.github.com> ([48ce584](https://github.com/tj-actions/changed-files/commit/48ce5846c9a7c7c959b6c60e3afc80aaba4e6b0c))  - (tj-actions[bot])
+
+# [37.4.0](https://github.com/tj-actions/changed-files/compare/v37.3.0...v37.4.0) - (2023-07-20)
+
+## <!-- 0 -->🚀 Features
+
+- Update error handling for yaml inputs ([#1395](https://github.com/tj-actions/changed-files/issues/1395)) ([de0eba3](https://github.com/tj-actions/changed-files/commit/de0eba32790fb9bf87471b32855a30fc8f9d5fc6))  - (Tonye Jack)
+
+## <!-- 26 -->🔄 Update
+
+- Update README.md ([bc262c2](https://github.com/tj-actions/changed-files/commit/bc262c2f61e2fdc75b802ad2213f80fefc98af12))  - (Tonye Jack)
+- Update README.md ([d4389f0](https://github.com/tj-actions/changed-files/commit/d4389f0f4fe92065f29aee6519d551c3c5d26583))  - (Tonye Jack)
+- Updated README.md ([#1394](https://github.com/tj-actions/changed-files/issues/1394))
+
+Co-authored-by: jackton1 <jackton1@users.noreply.github.com> ([7998446](https://github.com/tj-actions/changed-files/commit/79984462e18db53eaaee1f8d582c2e752d13cf0c))  - (tj-actions[bot])
+- Update action.yml ([c6dcc2a](https://github.com/tj-actions/changed-files/commit/c6dcc2a013c3d4f2a21908234845ba52952f2a57))  - (Tonye Jack)
+
+## <!-- 9 -->⬆️ Upgrades
+
+- Upgraded to v37.3.0 ([#1392](https://github.com/tj-actions/changed-files/issues/1392))
+
+Co-authored-by: jackton1 <jackton1@users.noreply.github.com> ([e6dde3c](https://github.com/tj-actions/changed-files/commit/e6dde3c0653441e7c18779d1207fe87efa071f02))  - (tj-actions[bot])
+
 # [37.3.0](https://github.com/tj-actions/changed-files/compare/v37.2.0...v37.3.0) - (2023-07-19)
 
 ## <!-- 0 -->🚀 Features

README.md

@@ -48,6 +48,7 @@ Effortlessly track all changed files and directories relative to a target branch
 *   Facilitates easy debugging.
 *   Scales to handle large repositories.
 *   Supports Git submodules.
+*   Supports [merge queues](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue) for pull reequests.
 *   Generates escaped JSON output for running matrix jobs based on changed files.
 *   Lists changed directories.
     *   Limits matching changed directories to a specified maximum depth.
@@ -79,11 +80,13 @@ And many more.
 
 > **Warning**:
 >
-> *   **IMPORTANT:** For `push` events when configuring [`actions/checkout`](https://github.com/actions/checkout#usage) the `fetch-depth` should be set to either `fetch-depth: 0` **OR** `fetch-depth: 2` depending on your use case.
-> *   For monorepos where pulling all the branch history might not be desired, you can omit [`actions/checkout`](https://github.com/actions/checkout#usage) - `fetch-depth` for `pull_request` events.
-> *   All multiline inputs should not use double or single quotes since the value is already a string separated by a newline character. See [Examples](#examples) for more information.
-> *   Ensure that `persist-credentials` is set to `true` when configuring [`actions/checkout`](https://github.com/actions/checkout#usage) if `fetch-depth` isn't set to `0`.
-> *   For repositories that have PRs generated from forks when configuring [`actions/checkout`](https://github.com/actions/checkout#usage) set the `repository` to `${{ github.event.pull_request.head.repo.full_name }}`. See: [Example](https://github.com/tj-actions/changed-files/blob/main/.github/workflows/test.yml#L47-L51)
+> *   For `push` events: \*\*When configuring [`actions/checkout`](https://github.com/actions/checkout#usage), make sure to set [`fetch-depth`](https://github.com/actions/checkout#usage) to either `0` or `2`, depending on your use case.
+> *   For mono repositories where pulling all the branch history might not be desired, you can still use the default [`fetch-depth`](https://github.com/actions/checkout#usage), which is set to `1` for `pull_request` events.
+> *   Avoid using single or double quotes for multiline inputs, as the value is already a string separated by a newline character. See [Examples](#examples) for more information.
+> *   If [`fetch-depth`](https://github.com/actions/checkout#usage) isn't set to `0`, ensure that `persist-credentials` is set to `true` when configuring [`actions/checkout`](https://github.com/actions/checkout#usage).
+> *   For repositories that have PRs generated from forks, when configuring [`actions/checkout`](https://github.com/actions/checkout#usage), set the [`repository`](https://github.com/actions/checkout#usage) to `${{ github.event.pull_request.head.repo.full_name }}`. See [Example](https://github.com/tj-actions/changed-files/blob/main/.github/workflows/test.yml#L47-L51).
+
+Visit the [discussions for more information](https://github.com/tj-actions/changed-files/discussions) or [create a new discussion](https://github.com/tj-actions/changed-files/discussions/new/choose) for usage-related questions.
 
 ### On `pull_request`
 
@@ -117,17 +120,18 @@ jobs:
           files_yaml: |
             doc:
               - '**.md'
-              - 'docs/**'
-              - !docs/README.md
+              - docs/**
+              - docs/README.md
             test:
-              - 'test/**'
-              - !test/README.md
+              - test/**
+              - '!test/**.md'
             src:
               - src/**
           # Optionally set `files_yaml_from_source_file` to read the YAML from a file. e.g `files_yaml_from_source_file: .github/changed-files.yml`
 
       - name: Run step if test file(s) change
-        if: steps.changed-files-yaml.outputs.test_any_changed == 'true'
+        # NOTE: The key has to start with the same key used above e.g. `test_(...)` | `doc_(...)` | `src_(...)` when trying to access the `any_changed` output.
+        if: steps.changed-files-yaml.outputs.test_any_changed == 'true'  
         run: |
           echo "One or more test file(s) has changed."
           echo "List all the files that have changed: ${{ steps.changed-files-yaml.outputs.test_all_changed_files }}"
@@ -222,7 +226,9 @@ on:
 #     - cron: '0 0 * * *'
 #
 #  release:
-#    types: [published]
+#    types: [...]
+#
+#  workflow_dispatch:
 #
 #  push:
 #    tags:

dist/index.js

@@ -667,12 +667,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getSHAForPullRequestEvent = exports.getSHAForPushEvent = void 0;
+exports.getSHAForPullRequestEvent = exports.getSHAForNonPullRequestEvent = void 0;
 const core = __importStar(__nccwpck_require__(2186));
 const github = __importStar(__nccwpck_require__(5438));
 const utils_1 = __nccwpck_require__(918);
 const getCurrentSHA = ({ inputs, workingDirectory }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     let currentSha = inputs.sha;
     core.debug('Getting current SHA...');
     if (inputs.until) {
@@ -706,6 +706,9 @@ const getCurrentSHA = ({ inputs, workingDirectory }) => __awaiter(void 0, void 0
                 })) === 0) {
                 currentSha = (_f = (_e = github.context.payload.pull_request) === null || _e === void 0 ? void 0 : _e.head) === null || _f === void 0 ? void 0 : _f.sha;
             }
+            else if (github.context.eventName === 'merge_group') {
+                currentSha = (_g = github.context.payload.merge_group) === null || _g === void 0 ? void 0 : _g.head_sha;
+            }
             else {
                 currentSha = yield (0, utils_1.getHeadSha)({ cwd: workingDirectory });
             }
@@ -715,16 +718,21 @@ const getCurrentSHA = ({ inputs, workingDirectory }) => __awaiter(void 0, void 0
     core.debug(`Current SHA: ${currentSha}`);
     return currentSha;
 });
-const getSHAForPushEvent = (inputs, env, workingDirectory, isShallow, hasSubmodule, gitFetchExtraArgs, isTag) => __awaiter(void 0, void 0, void 0, function* () {
-    var _g;
+const getSHAForNonPullRequestEvent = (inputs, env, workingDirectory, isShallow, hasSubmodule, gitFetchExtraArgs, isTag) => __awaiter(void 0, void 0, void 0, function* () {
+    var _h, _j, _k;
     let targetBranch = env.GITHUB_REF_NAME;
     const currentBranch = targetBranch;
     let initialCommit = false;
     if (isShallow && !inputs.skipInitialFetch) {
         core.info('Repository is shallow, fetching more history...');
         if (isTag) {
-            const sourceBranch = github.context.payload.base_ref.replace('refs/heads/', '') ||
-                ((_g = github.context.payload.release) === null || _g === void 0 ? void 0 : _g.target_commitish);
+            let sourceBranch = '';
+            if (github.context.payload.base_ref) {
+                sourceBranch = github.context.payload.base_ref.replace('refs/heads/', '');
+            }
+            else if ((_h = github.context.payload.release) === null || _h === void 0 ? void 0 : _h.target_commitish) {
+                sourceBranch = (_j = github.context.payload.release) === null || _j === void 0 ? void 0 : _j.target_commitish;
+            }
             yield (0, utils_1.gitFetch)({
                 cwd: workingDirectory,
                 args: [
@@ -807,10 +815,16 @@ const getSHAForPushEvent = (inputs, env, workingDirectory, isShallow, hasSubmodu
             targetBranch = tag;
         }
         else {
-            core.debug('Getting previous SHA for last remote commit...');
-            if (github.context.payload.forced === 'false' ||
-                !github.context.payload.forced) {
-                previousSha = github.context.payload.before;
+            if (github.context.eventName === 'merge_group') {
+                core.debug('Getting previous SHA for merge group...');
+                previousSha = (_k = github.context.payload.merge_group) === null || _k === void 0 ? void 0 : _k.base_sha;
+            }
+            else {
+                core.debug('Getting previous SHA for last remote commit...');
+                if (github.context.payload.forced === 'false' ||
+                    !github.context.payload.forced) {
+                    previousSha = github.context.payload.before;
+                }
             }
             if (!previousSha ||
                 previousSha === '0000000000000000000000000000000000000000') {
@@ -858,11 +872,11 @@ const getSHAForPushEvent = (inputs, env, workingDirectory, isShallow, hasSubmodu
         initialCommit
     };
 });
-exports.getSHAForPushEvent = getSHAForPushEvent;
+exports.getSHAForNonPullRequestEvent = getSHAForNonPullRequestEvent;
 const getSHAForPullRequestEvent = (inputs, env, workingDirectory, isShallow, hasSubmodule, gitFetchExtraArgs) => __awaiter(void 0, void 0, void 0, function* () {
-    var _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
-    let targetBranch = (_j = (_h = github.context.payload.pull_request) === null || _h === void 0 ? void 0 : _h.base) === null || _j === void 0 ? void 0 : _j.ref;
-    const currentBranch = (_l = (_k = github.context.payload.pull_request) === null || _k === void 0 ? void 0 : _k.head) === null || _l === void 0 ? void 0 : _l.ref;
+    var _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+    let targetBranch = (_m = (_l = github.context.payload.pull_request) === null || _l === void 0 ? void 0 : _l.base) === null || _m === void 0 ? void 0 : _m.ref;
+    const currentBranch = (_p = (_o = github.context.payload.pull_request) === null || _o === void 0 ? void 0 : _o.head) === null || _p === void 0 ? void 0 : _p.ref;
     if (inputs.sinceLastRemoteCommit) {
         targetBranch = currentBranch;
     }
@@ -875,7 +889,7 @@ const getSHAForPullRequestEvent = (inputs, env, workingDirectory, isShallow, has
                 '-u',
                 '--progress',
                 'origin',
-                `pull/${(_m = github.context.payload.pull_request) === null || _m === void 0 ? void 0 : _m.number}/head:${currentBranch}`
+                `pull/${(_q = github.context.payload.pull_request) === null || _q === void 0 ? void 0 : _q.number}/head:${currentBranch}`
             ]
         });
         if (prFetchExitCode !== 0) {
@@ -940,8 +954,8 @@ const getSHAForPullRequestEvent = (inputs, env, workingDirectory, isShallow, has
             diff
         };
     }
-    if (!((_p = (_o = github.context.payload.pull_request) === null || _o === void 0 ? void 0 : _o.base) === null || _p === void 0 ? void 0 : _p.ref) ||
-        ((_r = (_q = github.context.payload.head) === null || _q === void 0 ? void 0 : _q.repo) === null || _r === void 0 ? void 0 : _r.fork) === 'true') {
+    if (!((_s = (_r = github.context.payload.pull_request) === null || _r === void 0 ? void 0 : _r.base) === null || _s === void 0 ? void 0 : _s.ref) ||
+        ((_u = (_t = github.context.payload.head) === null || _t === void 0 ? void 0 : _t.repo) === null || _u === void 0 ? void 0 : _u.fork) === 'true') {
         diff = '..';
     }
     if (!previousSha) {
@@ -957,7 +971,7 @@ const getSHAForPullRequestEvent = (inputs, env, workingDirectory, isShallow, has
                 });
                 if (!previousSha) {
                     core.warning('Unable to locate the previous commit in the local history. Falling back to the pull request base sha.');
-                    previousSha = (_t = (_s = github.context.payload.pull_request) === null || _s === void 0 ? void 0 : _s.base) === null || _t === void 0 ? void 0 : _t.sha;
+                    previousSha = (_w = (_v = github.context.payload.pull_request) === null || _v === void 0 ? void 0 : _v.base) === null || _w === void 0 ? void 0 : _w.sha;
                 }
             }
         }
@@ -967,7 +981,7 @@ const getSHAForPullRequestEvent = (inputs, env, workingDirectory, isShallow, has
                 branch: targetBranch
             });
             if (!previousSha) {
-                previousSha = (_v = (_u = github.context.payload.pull_request) === null || _u === void 0 ? void 0 : _u.base) === null || _v === void 0 ? void 0 : _v.sha;
+                previousSha = (_y = (_x = github.context.payload.pull_request) === null || _x === void 0 ? void 0 : _x.base) === null || _y === void 0 ? void 0 : _y.sha;
             }
             if (isShallow) {
                 if (!(yield (0, utils_1.canDiffCommits)({
@@ -1004,7 +1018,7 @@ const getSHAForPullRequestEvent = (inputs, env, workingDirectory, isShallow, has
             }
         }
         if (!previousSha || previousSha === currentSha) {
-            previousSha = (_x = (_w = github.context.payload.pull_request) === null || _w === void 0 ? void 0 : _w.base) === null || _x === void 0 ? void 0 : _x.sha;
+            previousSha = (_0 = (_z = github.context.payload.pull_request) === null || _z === void 0 ? void 0 : _z.base) === null || _0 === void 0 ? void 0 : _0.sha;
         }
     }
     if (!(yield (0, utils_1.canDiffCommits)({
@@ -1413,7 +1427,7 @@ const getChangedFilesFromLocalGit = ({ inputs, env, workingDirectory, filePatter
     let diffResult;
     if (!((_c = (_b = github.context.payload.pull_request) === null || _b === void 0 ? void 0 : _b.base) === null || _c === void 0 ? void 0 : _c.ref)) {
         core.info(`Running on a ${github.context.eventName || 'push'} event...`);
-        diffResult = yield (0, commitSha_1.getSHAForPushEvent)(inputs, env, workingDirectory, isShallow, hasSubmodule, gitFetchExtraArgs, isTag);
+        diffResult = yield (0, commitSha_1.getSHAForNonPullRequestEvent)(inputs, env, workingDirectory, isShallow, hasSubmodule, gitFetchExtraArgs, isTag);
     }
     else {
         core.info(`Running on a ${github.context.eventName || 'pull_request'} (${github.context.payload.action}) event...`);

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@tj-actions/glob",
-  "version": "17.2.5",
-  "description": "Glob pattern matching github action",
+  "name": "@tj-actions/changed-files",
+  "version": "37.4.0",
+  "description": "Github action to retrieve all (added, copied, modified, deleted, renamed, type changed, unmerged, unknown) files and directories.",
   "main": "lib/main.js",
   "publishConfig": {
     "registry": "https://npm.pkg.github.com"
@@ -18,7 +18,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/tj-actions/glob.git"
+    "url": "git+https://github.com/tj-actions/changed-files.git"
   },
   "keywords": [
     "actions",
@@ -28,9 +28,9 @@
   "author": "Tonye Jack",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/tj-actions/glob/issues"
+    "url": "https://github.com/tj-actions/changed-files/issues"
   },
-  "homepage": "https://github.com/tj-actions/glob#readme",
+  "homepage": "https://github.com/tj-actions/changed-files#readme",
   "dependencies": {
     "@actions/core": "^1.10.0",
     "@actions/exec": "^1.1.1",

src/commitSha.ts

@@ -57,6 +57,8 @@ const getCurrentSHA = async ({
         })) === 0
       ) {
         currentSha = github.context.payload.pull_request?.head?.sha
+      } else if (github.context.eventName === 'merge_group') {
+        currentSha = github.context.payload.merge_group?.head_sha
       } else {
         currentSha = await getHeadSha({cwd: workingDirectory})
       }
@@ -78,7 +80,7 @@ export interface DiffResult {
   initialCommit?: boolean
 }
 
-export const getSHAForPushEvent = async (
+export const getSHAForNonPullRequestEvent = async (
   inputs: Inputs,
   env: Env,
   workingDirectory: string,
@@ -95,9 +97,17 @@ export const getSHAForPushEvent = async (
     core.info('Repository is shallow, fetching more history...')
 
     if (isTag) {
-      const sourceBranch =
-        github.context.payload.base_ref.replace('refs/heads/', '') ||
-        github.context.payload.release?.target_commitish
+      let sourceBranch = ''
+
+      if (github.context.payload.base_ref) {
+        sourceBranch = github.context.payload.base_ref.replace(
+          'refs/heads/',
+          ''
+        )
+      } else if (github.context.payload.release?.target_commitish) {
+        sourceBranch = github.context.payload.release?.target_commitish
+      }
+
       await gitFetch({
         cwd: workingDirectory,
         args: [
@@ -189,12 +199,17 @@ export const getSHAForPushEvent = async (
       previousSha = sha
       targetBranch = tag
     } else {
-      core.debug('Getting previous SHA for last remote commit...')
-      if (
-        github.context.payload.forced === 'false' ||
-        !github.context.payload.forced
-      ) {
-        previousSha = github.context.payload.before
+      if (github.context.eventName === 'merge_group') {
+        core.debug('Getting previous SHA for merge group...')
+        previousSha = github.context.payload.merge_group?.base_sha
+      } else {
+        core.debug('Getting previous SHA for last remote commit...')
+        if (
+          github.context.payload.forced === 'false' ||
+          !github.context.payload.forced
+        ) {
+          previousSha = github.context.payload.before
+        }
       }
 
       if (

src/main.ts

@@ -12,7 +12,7 @@ import {setChangedFilesOutput} from './changedFilesOutput'
 import {
   DiffResult,
   getSHAForPullRequestEvent,
-  getSHAForPushEvent
+  getSHAForNonPullRequestEvent
 } from './commitSha'
 import {Env, getEnv} from './env'
 import {getInputs, Inputs} from './inputs'
@@ -130,7 +130,7 @@ const getChangedFilesFromLocalGit = async ({
 
   if (!github.context.payload.pull_request?.base?.ref) {
     core.info(`Running on a ${github.context.eventName || 'push'} event...`)
-    diffResult = await getSHAForPushEvent(
+    diffResult = await getSHAForNonPullRequestEvent(
       inputs,
       env,
       workingDirectory,