Skip to content

Scheduling infrastructure for absolutely everyone.

chore: ignore fork PRs in devin-conflict-resolver workflow (#26640)

Keith Williams2a26a591a8a4
diff --git a/.github/workflows/devin-conflict-resolver.yml b/.github/workflows/devin-conflict-resolver.yml
index 30315d4c86f..ad8ea569ffb 100644
--- a/.github/workflows/devin-conflict-resolver.yml
+++ b/.github/workflows/devin-conflict-resolver.yml
@@ -86,12 +86,18 @@ jobs:
function processPR(pr, mergeableStatus) {
const isTargetPR = manualPrNumber && pr.number === manualPrNumber;
+ const isFork = pr.headRepository?.owner?.login !== owner;
if (!isTargetPR && pr.isDraft) {
console.log(`PR #${pr.number} is a draft, skipping`);
return { skip: true };
}
+ if (!isTargetPR && isFork) {
+ console.log(`PR #${pr.number} is from a fork, skipping`);
+ return { skip: true };
+ }
+
if (!isTargetPR) {
const hasDevinLabel = pr.labels.nodes.some(label => label.name === 'devin-conflict-resolution');
if (hasDevinLabel) {
@@ -101,19 +107,13 @@ jobs:
}
if (mergeableStatus === 'CONFLICTING' || (isTargetPR && mergeableStatus !== 'MERGEABLE')) {
- const isFork = pr.headRepository?.owner?.login !== owner;
const headRepoOwner = pr.headRepository?.owner?.login || owner;
const headRepoName = pr.headRepository?.name || repo;
- if (!isTargetPR && isFork && !pr.maintainerCanModify) {
- console.log(`PR #${pr.number} is from a fork without maintainer push access, skipping`);
- return { skip: true };
- }
-
if (isTargetPR) {
console.log(`PR #${pr.number} manually targeted for conflict resolution${isFork ? ' (from fork)' : ''}`);
} else {
- console.log(`PR #${pr.number} has conflicts${isFork ? ' (from fork)' : ''}`);
+ console.log(`PR #${pr.number} has conflicts`);
}
return {