[TASK] Ignore merge commits for push event

Author: gilbertsoft

__tests__/input-helper.test.ts

@@ -553,6 +553,7 @@ describe('input-helper tests', () => {
     expect(checkerArguments.pattern).toBe('some-pattern')
     expect(checkerArguments.error).toBe('some-error')
     expect(checkerArguments.messages).toBeTruthy()
+    expect(checkerArguments.messages.length).toBe(1)
     expect(checkerArguments.messages[0]).toBe('some-message')
   })
 
@@ -566,6 +567,12 @@ describe('input-helper tests', () => {
           },
           {
             message: 'other-message'
+          },
+          {
+            message: 'ignored-message',
+            parents: {
+              totalCount: 2
+            }
           }
         ]
       }
@@ -577,6 +584,7 @@ describe('input-helper tests', () => {
     expect(checkerArguments.pattern).toBe('some-pattern')
     expect(checkerArguments.error).toBe('some-error')
     expect(checkerArguments.messages).toBeTruthy()
+    expect(checkerArguments.messages.length).toBe(2)
     expect(checkerArguments.messages[0]).toBe('some-message')
     expect(checkerArguments.messages[1]).toBe('other-message')
   })

dist/index.js

@@ -236,7 +236,7 @@ exports.getInputs = getInputs;
  * @returns   string[]
  */
 function getMessages(pullRequestOptions) {
-    var _a;
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         core.debug('Get messages...');
         core.debug(` - pullRequestOptions: ${JSON.stringify(pullRequestOptions, null, 2)}`);
@@ -311,7 +311,9 @@ function getMessages(pullRequestOptions) {
                     break;
                 }
                 for (const i in github.context.payload.commits) {
-                    if (github.context.payload.commits[i].message) {
+                    if (github.context.payload.commits[i].message &&
+                        // ignore merge commits
+                        ((_c = (_b = github.context.payload.commits[i].parents) === null || _b === void 0 ? void 0 : _b.totalCount) !== null && _c !== void 0 ? _c : 1) === 1) {
                         messages.push(github.context.payload.commits[i].message);
                     }
                 }

src/input-helper.ts

@@ -201,7 +201,11 @@ async function getMessages(
       }
 
       for (const i in github.context.payload.commits) {
-        if (github.context.payload.commits[i].message) {
+        if (
+          github.context.payload.commits[i].message &&
+          // ignore merge commits
+          (github.context.payload.commits[i].parents?.totalCount ?? 1) === 1
+        ) {
           messages.push(github.context.payload.commits[i].message)
         }
       }