|
| 1 | +// .github/scripts/bot-merge-conflict.js |
| 2 | + |
| 3 | +const BOT_SIGNATURE = '[MergeConflictBotSignature-v1]'; |
| 4 | + |
| 5 | +module.exports = async ({ github, context, core }) => { |
| 6 | + const { owner, repo } = context.repo; |
| 7 | + |
| 8 | + // Validate event context |
| 9 | + if (context.eventName !== 'push' && context.eventName !== 'pull_request_target') { |
| 10 | + console.log(`Unsupported event type: ${context.eventName}. Skipping.`); |
| 11 | + return; |
| 12 | + } |
| 13 | + |
| 14 | + // Check for dry-run mode |
| 15 | + const dryRun = process.env.DRY_RUN === 'true'; |
| 16 | + |
| 17 | + // Fetch PR with retry logic for unknown state |
| 18 | + async function getPrWithRetry(prNumber) { |
| 19 | + for (let i = 0; i < 10; i++) { |
| 20 | + const { data: pr } = await github.rest.pulls.get({ |
| 21 | + owner, repo, pull_number: prNumber |
| 22 | + }); |
| 23 | + |
| 24 | + if (pr.mergeable_state !== 'unknown') return pr; |
| 25 | + |
| 26 | + console.log(`PR #${prNumber} state is 'unknown'. Retrying (${i+1}/10)...`); |
| 27 | + await new Promise(r => setTimeout(r, 2000)); |
| 28 | + } |
| 29 | + const { data: pr } = await github.rest.pulls.get({ owner, repo, pull_number: prNumber }); |
| 30 | + if (pr.mergeable_state === 'unknown') { |
| 31 | + console.warn(`PR #${prNumber} state still 'unknown' after 10 retries.`); |
| 32 | + } |
| 33 | + return pr; |
| 34 | + } |
| 35 | + |
| 36 | + // Post comment |
| 37 | + async function notifyUser(prNumber) { |
| 38 | + const { data: comments } = await github.rest.issues.listComments({ |
| 39 | + owner, repo, issue_number: prNumber, |
| 40 | + }); |
| 41 | + |
| 42 | + if (comments.some(c => c.body.includes(BOT_SIGNATURE))) { |
| 43 | + console.log(`Already commented on PR #${prNumber}. Skipping.`); |
| 44 | + return; |
| 45 | + } |
| 46 | + |
| 47 | + const body = `Hi, this is MergeConflictBot.\nYour pull request cannot be merged because it contains **merge conflicts**.\n\nPlease resolve these conflicts locally and push the changes.\n\nTo assist you, please read:\n- [Resolving Merge Conflicts](https://github.com/${owner}/${repo}/blob/main/docs/sdk_developers/merge_conflicts.md)\n- [Rebasing Guide](https://github.com/${owner}/${repo}/blob/main/docs/sdk_developers/rebasing.md)\n\nThank you for contributing!\n<!-- \nFrom the Hiero Python SDK Team\n${BOT_SIGNATURE} -->`; |
| 48 | + |
| 49 | + if (dryRun) { |
| 50 | + console.log(`[DRY RUN] Would post comment to PR #${prNumber}: ${body}`); |
| 51 | + return; |
| 52 | + } |
| 53 | + |
| 54 | + await github.rest.issues.createComment({ |
| 55 | + owner, repo, issue_number: prNumber, body: body |
| 56 | + }); |
| 57 | + } |
| 58 | + |
| 59 | + // Set commit status |
| 60 | + async function setCommitStatus(sha, state, description) { |
| 61 | + if (dryRun) { |
| 62 | + console.log(`[DRY RUN] Would set status for ${sha}: ${state} - ${description}`); |
| 63 | + return; |
| 64 | + } |
| 65 | + |
| 66 | + await github.rest.repos.createCommitStatus({ |
| 67 | + owner, repo, sha: sha, state: state, |
| 68 | + context: 'Merge Conflict Detector', |
| 69 | + description: description, |
| 70 | + target_url: `${process.env.GITHUB_SERVER_URL}/${owner}/${repo}/actions/runs/${context.runId}` |
| 71 | + }); |
| 72 | + } |
| 73 | + |
| 74 | + // Main |
| 75 | + let prsToCheck = []; |
| 76 | + |
| 77 | + // Push to main |
| 78 | + if (context.eventName === 'push') { |
| 79 | + console.log("Triggered by Push to Main. Fetching all open PRs..."); |
| 80 | + const openPrs = await github.paginate(github.rest.pulls.list, { |
| 81 | + owner, repo, state: 'open', base: 'main', per_page: 100 |
| 82 | + }); |
| 83 | + prsToCheck = openPrs.map(pr => pr.number); |
| 84 | + } |
| 85 | + // PR update |
| 86 | + else { |
| 87 | + console.log("Triggered by PR update."); |
| 88 | + if (!context.payload.pull_request?.number) { |
| 89 | + core.setFailed('Missing pull_request data in event payload'); |
| 90 | + return; |
| 91 | + } |
| 92 | + prsToCheck.push(context.payload.pull_request.number); |
| 93 | + } |
| 94 | + |
| 95 | + for (const prNumber of prsToCheck) { |
| 96 | + try { |
| 97 | + console.log(`Checking PR #${prNumber}...`); |
| 98 | + const pr = await getPrWithRetry(prNumber); |
| 99 | + |
| 100 | + if (pr.mergeable_state === 'unknown') { |
| 101 | + console.log(`PR #${prNumber} state is still 'unknown'. Skipping conflict check.`); |
| 102 | + continue; |
| 103 | + } |
| 104 | + |
| 105 | + if (pr.mergeable_state === 'dirty') { |
| 106 | + console.log(`Conflict detected in PR #${prNumber}`); |
| 107 | + await notifyUser(prNumber); |
| 108 | + |
| 109 | + // Push events: set commit status on PR head SHA |
| 110 | + // PR events: fail the workflow run (creates a check on the PR) |
| 111 | + if (context.eventName === 'push') { |
| 112 | + await setCommitStatus(pr.head.sha, 'failure', 'Conflicts detected with main'); |
| 113 | + } else { |
| 114 | + core.setFailed(`Merge conflicts detected in PR #${prNumber}.`); |
| 115 | + } |
| 116 | + } else { |
| 117 | + console.log(`PR #${prNumber} is clean.`); |
| 118 | + // For push events, set success status; PR events rely on workflow run success |
| 119 | + if (context.eventName === 'push') { |
| 120 | + await setCommitStatus(pr.head.sha, 'success', 'No conflicts detected'); |
| 121 | + } |
| 122 | + } |
| 123 | + } catch (error) { |
| 124 | + console.error(`Error checking PR #${prNumber}: ${error.message}`); |
| 125 | + if (context.eventName !== 'push') { |
| 126 | + throw error; // Re-throw for PR events to fail the workflow |
| 127 | + } |
| 128 | + // For push events, log and continue to check remaining PRs |
| 129 | + } |
| 130 | + } |
| 131 | +}; |
0 commit comments