vynte-infra/calendar
2
0
Fork 0
Code Issues Pull Requests Actions 1.2k Packages Projects Releases Wiki Activity

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

Browse Source 
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
Keith Williams
2026-01-09 20:35:30 +00:00
committed by GitHub
co-authored by Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
parent 4819be0093
commit 2a26a591a8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/devin-conflict-resolver.yml
+7 -7
View File
@@ -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 {