|
| 1 | +name: Check for Merge Conflicts |
| 2 | + |
| 3 | +on: |
| 4 | + pull_request: |
| 5 | + types: [opened, synchronize, reopened] |
| 6 | + # Also run when the base branch is updated |
| 7 | + push: |
| 8 | + branches: |
| 9 | + - main |
| 10 | + |
| 11 | +jobs: |
| 12 | + check-merge-conflict: |
| 13 | + runs-on: ubuntu-latest |
| 14 | + if: github.event_name == 'pull_request' |
| 15 | + |
| 16 | + steps: |
| 17 | + - name: Check for merge conflicts |
| 18 | + uses: actions/github-script@v7 |
| 19 | + with: |
| 20 | + script: | |
| 21 | + const pr = context.payload.pull_request; |
| 22 | +
|
| 23 | + // Get the PR details to check mergeable state |
| 24 | + const { data: pullRequest } = await github.rest.pulls.get({ |
| 25 | + owner: context.repo.owner, |
| 26 | + repo: context.repo.repo, |
| 27 | + pull_number: pr.number |
| 28 | + }); |
| 29 | +
|
| 30 | + console.log(`PR #${pr.number} mergeable state: ${pullRequest.mergeable_state}`); |
| 31 | + console.log(`PR #${pr.number} mergeable: ${pullRequest.mergeable}`); |
| 32 | +
|
| 33 | + // The mergeable field can be: true, false, or null (if GitHub is still calculating) |
| 34 | + if (pullRequest.mergeable === null) { |
| 35 | + console.log('GitHub is still calculating mergeable status. Waiting...'); |
| 36 | + // Wait a bit and try again |
| 37 | + await new Promise(resolve => setTimeout(resolve, 5000)); |
| 38 | +
|
| 39 | + const { data: updatedPR } = await github.rest.pulls.get({ |
| 40 | + owner: context.repo.owner, |
| 41 | + repo: context.repo.repo, |
| 42 | + pull_number: pr.number |
| 43 | + }); |
| 44 | +
|
| 45 | + console.log(`Updated mergeable state: ${updatedPR.mergeable_state}`); |
| 46 | + console.log(`Updated mergeable: ${updatedPR.mergeable}`); |
| 47 | +
|
| 48 | + if (updatedPR.mergeable === false) { |
| 49 | + core.setFailed(`❌ PR #${pr.number} has merge conflicts that must be resolved.`); |
| 50 | + } else if (updatedPR.mergeable === null) { |
| 51 | + core.warning('⚠️ Could not determine merge conflict status. GitHub may still be calculating.'); |
| 52 | + } else { |
| 53 | + console.log(`✅ PR #${pr.number} has no merge conflicts.`); |
| 54 | + } |
| 55 | + } else if (pullRequest.mergeable === false) { |
| 56 | + core.setFailed(`❌ PR #${pr.number} has merge conflicts that must be resolved.`); |
| 57 | + } else { |
| 58 | + console.log(`✅ PR #${pr.number} has no merge conflicts.`); |
| 59 | + } |
0 commit comments