Skip to content

fix(github-actions): update create-pr-for-changes to rebase on conflicts #2770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix(github-actions): update create-pr-for-changes to rebase on conflicts #2770

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions github-actions/create-pr-for-changes/lib/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,33 @@ async function main(): Promise<void> {

if (matchingPrs.length > 0) {
// A PR for the same set of changes does already exist. Exit.
core.info(
`Skipping PR creation, because there is already a PR: #${matchingPrs[0].number} ` +
`(${matchingPrs[0].html_url})`,
);
for (const matchingPr of matchingPrs) {
// Check whether there is a PR is conflicting
const {
data: {mergeable},
} = await git.github.pulls.get({
owner: repo.owner,
repo: repo.name,
pull_number: matchingPr.number,
});

core.info(
`Skipping PR creation, because there is already a PR: #${matchingPr.number} ` +
`(${matchingPr.html_url})`,
);

if (!mergeable) {
core.info(`PR is not mergable, rebasing PR: #${matchingPr.number}`);

// Rebase PR
await git.github.pulls.updateBranch({
owner: forkRepo.owner,
repo: forkRepo.name,
pull_number: matchingPr.number,
});
}
}

return;
} else {
core.info(`No pre-existing PR found for branch '${branchName}'.`);
Expand Down
Loading