Merge branch 'main' into feat/receipt-node-failover#1171

Adityarya11 · web-flow · commit a6e705ac8d9b · 2026-03-11T19:22:09.000+05:30
diff --git a/.github/scripts/helpers/checks.js b/.github/scripts/helpers/checks.js
@@ -29,21 +29,37 @@ function hasVerifiedGPGSignature(commit) {
 }
 
 /**
- * Checks all commits for DCO sign-off.
- * @param {Array<{ sha?: string, commit?: { message?: string } }>} commits
+ * Returns true if the commit is a merge commit (has more than one parent).
+ * Merge commits are auto-generated by Git and should be exempt from DCO sign-off.
+ * @param {{ parents?: Array }} commit
+ * @returns {boolean}
+ */
+function isMergeCommit(commit) {
+  return Array.isArray(commit?.parents) && commit.parents.length > 1;
+}
+
+/**
+ * Checks all commits for DCO sign-off. Merge commits are skipped.
+ * @param {Array<{ sha?: string, parents?: Array, commit?: { message?: string } }>} commits
  * @returns {{ passed: boolean, failures: Array<{ sha: string, message: string }> }}
  */
 function checkDCO(commits) {
   const failures = [];
+  let skipped = 0;
   for (const c of commits) {
+    if (isMergeCommit(c)) {
+      skipped++;
+      continue;
+    }
     const message = c.commit?.message || '';
     const shortSha = (c.sha || '').slice(0, 7);
     const firstLine = message.split('\n')[0] || '(no message)';
     if (!hasDCOSignoff(message)) {
       failures.push({ sha: shortSha, message: firstLine });
     }
   }
-  getLogger().log(`DCO check: ${commits.length - failures.length}/${commits.length} passed`);
+  const checked = commits.length - skipped;
+  getLogger().log(`DCO check: ${checked - failures.length}/${checked} passed (${skipped} merge commit(s) skipped)`);
   return { passed: failures.length === 0, failures };
 }
 
@@ -201,6 +217,7 @@ async function checkIssueLink(botContext, { fetchIssue, fetchClosingIssueNumbers
 module.exports = {
   hasDCOSignoff,
   hasVerifiedGPGSignature,
+  isMergeCommit,
   checkDCO,
   checkGPG,
   checkMergeConflict,
diff --git a/.github/scripts/helpers/comments.js b/.github/scripts/helpers/comments.js
@@ -49,15 +49,15 @@ function buildSection({ title, result, passMessage }) {
  * @returns {string}
  */
 function buildDCOSection(dco) {
-  const common = buildSection({ title: 'DCO Sign-off', result: dco, passMessage: 'All commits have valid sign-offs.' });
+  const common = buildSection({ title: 'DCO Sign-off', result: dco, passMessage: 'All commits have valid sign-offs. Nice work!' });
   if (common) return common;
 
   const failList = (dco.failures || []).map(f => `- \`${f.sha}\` ${f.message}`).join('\n');
   return [
-    ':x: **DCO Sign-off** -- The following commits are missing the required DCO sign-off:',
+    ':x: **DCO Sign-off** -- Uh oh! The following commits are missing the required DCO sign-off:',
     failList,
     '',
-    `Please add \`Signed-off-by: Your Name <email>\` to each commit (e.g. \`git commit -s\`). See the [Signing Guide](${SIGNING_GUIDE}).`,
+    `No worries, this is an easy fix! Add \`Signed-off-by: Your Name <email>\` to each commit (e.g. \`git commit -s\`). See the [Signing Guide](${SIGNING_GUIDE}).`,
   ].join('\n');
 }
 
@@ -66,15 +66,15 @@ function buildDCOSection(dco) {
  * @returns {string}
  */
 function buildGPGSection(gpg) {
-  const common = buildSection({ title: 'GPG Signature', result: gpg, passMessage: 'All commits have verified GPG signatures.' });
+  const common = buildSection({ title: 'GPG Signature', result: gpg, passMessage: 'All commits have verified GPG signatures. Locked and loaded!' });
   if (common) return common;
 
   const failList = (gpg.failures || []).map(f => `- \`${f.sha}\` ${f.message}`).join('\n');
   return [
-    ':x: **GPG Signature** -- The following commits don\'t have a verified GPG signature:',
+    ':x: **GPG Signature** -- Heads up! The following commits don\'t have a verified GPG signature:',
     failList,
     '',
-    `Please sign your commits with GPG (e.g. \`git commit -S\`). See the [Signing Guide](${SIGNING_GUIDE}).`,
+    `You\'ll need to sign your commits with GPG (e.g. \`git commit -S\`). See the [Signing Guide](${SIGNING_GUIDE}) for a step-by-step walkthrough.`,
   ].join('\n');
 }
 
@@ -83,13 +83,13 @@ function buildGPGSection(gpg) {
  * @returns {string}
  */
 function buildMergeSection(merge) {
-  const common = buildSection({ title: 'Merge Conflicts', result: merge, passMessage: 'No merge conflicts detected.' });
+  const common = buildSection({ title: 'Merge Conflicts', result: merge, passMessage: 'No merge conflicts detected. Smooth sailing!' });
   if (common) return common;
 
   return [
-    ':x: **Merge Conflicts** -- This PR has merge conflicts with the base branch.',
+    ':x: **Merge Conflicts** -- Oh no, this PR has merge conflicts with the base branch.',
     '',
-    `Please update your branch (e.g. rebase or merge from base) and push. See the [Merge Conflicts Guide](${MERGE_CONFLICTS_GUIDE}).`,
+    `Let\'s get this sorted! Update your branch (e.g. rebase or merge from base) and push. See the [Merge Conflicts Guide](${MERGE_CONFLICTS_GUIDE}) if you need a hand.`,
   ].join('\n');
 }
 
@@ -108,15 +108,15 @@ function buildIssueLinkSection(issueLink) {
   if (issueLink.reason === 'not_assigned') {
     const unassigned = (issueLink.issues || []).filter(i => !i.isAssigned).map(i => `#${i.number}`).join(', ');
     return [
-      `:x: **Issue Link** -- You are not assigned to the following linked issues: ${unassigned}.`,
+      `:x: **Issue Link** -- Almost there! You are not assigned to the following linked issues: ${unassigned}.`,
       '',
-      'Please ensure you are assigned to all linked issues before opening a PR.',
+      'Please ensure you are assigned to all linked issues before opening a PR. You can comment `/assign` on the issue to grab it!',
     ].join('\n');
   }
   return [
     ':x: **Issue Link** -- This PR is not linked to any issue.',
     '',
-    'Please reference an issue using a closing keyword (e.g. `Fixes #123`) and ensure the issue is assigned to you.',
+    'Please reference an issue using a closing keyword (e.g. `Fixes #123`) and ensure the issue is assigned to you. Every PR needs a home!',
   ].join('\n');
 }
 
@@ -166,20 +166,19 @@ function allChecksPassed({ dco, gpg, merge, issueLink }) {
  */
 function buildBotComment({ prAuthor, dco, gpg, merge, issueLink }) {
   const greeting = [
-    `Hi @${prAuthor} :wave:, thank you for submitting this PR!`,
-    "I'm your **PR Helper Bot** and I'll be keeping track of your PR's",
-    'status to help you get it approved and merged.',
+    `Hey @${prAuthor} :wave: thanks for the PR!`,
+    "I'm your friendly **PR Helper Bot** :robot: and I'll be riding shotgun on this one, keeping track of your PR's status to help you get it approved and merged.",
     '',
-    'This comment will stay updated as you make changes.',
-    "Here's where things stand:",
+    "This comment updates automatically as you push changes -- think of it as your PR's live scoreboard!",
+    "Here's the latest:",
   ].join('\n');
 
   const checksSection = buildChecksSection({ dco, gpg, merge, issueLink });
   const passed = allChecksPassed({ dco, gpg, merge, issueLink });
 
   const footer = passed
-    ? ':tada: *All checks passed! Your PR is ready for review.*'
-    : '*All checks must pass before this PR can be reviewed.*';
+    ? ':tada: *All checks passed! Your PR is ready for review. Great job!*'
+    : ':hourglass_flowing_sand: *All checks must pass before this PR can be reviewed. You\'ve got this!*';
 
   const body = [MARKER, greeting, '', '---', '', checksSection, '', '---', '', footer].join('\n');
   return { marker: MARKER, body, allPassed: passed };
diff --git a/.github/scripts/tests/test-checks.js b/.github/scripts/tests/test-checks.js
@@ -9,6 +9,7 @@ const { runTestSuite } = require('./test-utils');
 const {
   hasDCOSignoff,
   hasVerifiedGPGSignature,
+  isMergeCommit,
   checkDCO,
   checkGPG,
   checkMergeConflict,
@@ -85,6 +86,34 @@ const unitTests = [
     test: () => hasVerifiedGPGSignature(null) === false,
   },
 
+  // ---------------------------------------------------------------------------
+  // isMergeCommit
+  // ---------------------------------------------------------------------------
+  {
+    name: 'isMergeCommit: commit with two parents returns true',
+    test: () => isMergeCommit({ parents: [{}, {}] }) === true,
+  },
+  {
+    name: 'isMergeCommit: commit with one parent returns false',
+    test: () => isMergeCommit({ parents: [{}] }) === false,
+  },
+  {
+    name: 'isMergeCommit: commit with no parents field returns false',
+    test: () => isMergeCommit({}) === false,
+  },
+  {
+    name: 'isMergeCommit: null commit returns false',
+    test: () => isMergeCommit(null) === false,
+  },
+  {
+    name: 'isMergeCommit: undefined commit returns false',
+    test: () => isMergeCommit(undefined) === false,
+  },
+  {
+    name: 'isMergeCommit: commit with empty parents array returns false',
+    test: () => isMergeCommit({ parents: [] }) === false,
+  },
+
   // ---------------------------------------------------------------------------
   // checkDCO
   // ---------------------------------------------------------------------------
@@ -133,6 +162,43 @@ const unitTests = [
       return r.passed === true && r.failures.length === 0;
     },
   },
+  {
+    name: 'checkDCO: merge commit without sign-off is skipped (passes)',
+    test: () => {
+      const commits = [
+        { sha: 'merge123', parents: [{}, {}], commit: { message: 'Merge branch main into feat' } },
+      ];
+      const r = checkDCO(commits);
+      return r.passed === true && r.failures.length === 0;
+    },
+  },
+  {
+    name: 'checkDCO: merge commit skipped, regular commits still checked',
+    test: () => {
+      const commits = [
+        { sha: 'abc1234', commit: { message: 'Fix\n\nSigned-off-by: A <a@x.com>' } },
+        { sha: 'merge56', parents: [{}, {}], commit: { message: 'Merge branch main into feat' } },
+        { sha: 'def5678', commit: { message: 'No sign-off here' } },
+      ];
+      const r = checkDCO(commits);
+      return (
+        r.passed === false &&
+        r.failures.length === 1 &&
+        r.failures[0].sha === 'def5678'
+      );
+    },
+  },
+  {
+    name: 'checkDCO: all regular commits pass with merge commit present',
+    test: () => {
+      const commits = [
+        { sha: 'abc1234', commit: { message: 'Fix\n\nSigned-off-by: A <a@x.com>' } },
+        { sha: 'merge56', parents: [{}, {}], commit: { message: 'Merge branch main into feat' } },
+      ];
+      const r = checkDCO(commits);
+      return r.passed === true && r.failures.length === 0;
+    },
+  },
 
   // ---------------------------------------------------------------------------
   // checkGPG
diff --git a/.github/scripts/tests/test-on-pr-update-bot.js b/.github/scripts/tests/test-on-pr-update-bot.js
@@ -10,6 +10,7 @@ const {
   commitDCOAndGPG,
   commitDCOFail,
   commitGPGFail,
+  commitMerge,
   createMockGithub,
 } = require('./test-utils');
 const script = require('../bot-on-pr-update.js');
@@ -389,6 +390,33 @@ const syncScenarios = [
     commentIncludes: ['All checks passed'],
     expectCreate: true,
   },
+  {
+    name: '[sync] Merge commit without DCO sign-off is skipped',
+    setup: () => ({
+      commits: [
+        ...passingCommits(),
+        {
+          sha: 'merge1234567890',
+          parents: [{}, {}],
+          commit: {
+            message: 'Merge branch \'main\' into feat/my-feature',
+            verification: { verified: true },
+          },
+        },
+      ],
+      mergeable: true,
+      comments: [],
+      prLabels: [{ name: LABELS.NEEDS_REVISION }],
+      prUser: { login: 'larry', type: 'User' },
+      prBody: 'Fixes #100',
+      closingIssues: [100],
+      issues: { 100: issueWithAssignee(100, 'Fix', 'larry') },
+    }),
+    verify: ({ calls }) =>
+      calls.labelsRemoved.includes(LABELS.NEEDS_REVISION) &&
+      calls.labelsAdded.some((arr) => arr.includes(LABELS.NEEDS_REVIEW)),
+    commentIncludes: ['All checks passed', ':white_check_mark:'],
+  },
 ];
 
 async function runSyncTest(scenario, index) {
@@ -775,6 +803,27 @@ const editScenarios = [
       commentIncludes: [':x: **Issue Link**', 'not linked to any issue'],
     },
   },
+  {
+    name: '[edit] Merge commit without DCO sign-off is skipped',
+    description: 'Mix of passing commit and merge commit (no sign-off). DCO still passes.',
+    context: defaultEditContext(),
+    githubOptions: {
+      commits: [
+        commitDCOAndGPG('abc1234', 'Add feature'),
+        commitMerge('merge567', 'Merge branch \'main\' into feat/my-feature'),
+      ],
+      mergeable: true,
+      issues: { 42: { title: 'Bug', assignees: [{ login: 'contributor' }] } },
+      graphqlClosingIssues: [],
+    },
+    expect: {
+      labelsAdded: [],
+      labelsRemoved: [],
+      assignees: [],
+      commentCreated: true,
+      commentIncludes: [':white_check_mark:', 'All checks passed'],
+    },
+  },
   {
     name: '[edit] Empty changes - early exit',
     description: 'changes: {} or no body. Early exit.',
diff --git a/.github/scripts/tests/test-utils.js b/.github/scripts/tests/test-utils.js
@@ -156,6 +156,17 @@ function commitGPGFail(sha, message) {
   };
 }
 
+function commitMerge(sha, message) {
+  return {
+    sha,
+    parents: [{}, {}],
+    commit: {
+      message,
+      verification: { verified: true },
+    },
+  };
+}
+
 // =============================================================================
 // MOCK GITHUB FACTORY
 // =============================================================================
@@ -264,5 +275,6 @@ module.exports = {
   commitDCOAndGPG,
   commitDCOFail,
   commitGPGFail,
+  commitMerge,
   createMockGithub,
 };
