Skip to content

fix(github-actions): delete obsolete branches and close superseded PRs #2773

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

Merged
merged 1 commit into from
May 9, 2025
Merged

fix(github-actions): delete obsolete branches and close superseded PRs #2773

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 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 @@ -129,6 +129,7 @@ async function main(): Promise<void> {
const {
Copy link
Contributor Author

@alan-agius4 alan-agius4 May 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: We could simplify this logic, if we keep re-using the same branch (like renovate)

data: {items: supersededPrs},
} = await git.github.search.issuesAndPullRequests({
advanced_search: 'true',
Copy link
Member

@devversion devversion May 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, when I read the commit description, I remembered that we already had logic for this in place. Is this just a fix because it didn't work?

Copy link
Contributor Author

@alan-agius4 alan-agius4 May 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

q: toGithubSearchQuery({
repo: `${repo.owner}/${repo.name}`,
type: 'pull-request',
Expand Down Expand Up @@ -276,6 +277,7 @@ async function cleanUpObsoleteBranches(
const {
data: {items: obsoletePrs},
} = await git.github.search.issuesAndPullRequests({
advanced_search: 'true',
q: toGithubSearchQuery({
repo: `${repo.owner}/${repo.name}`,
type: 'pull-request',
Expand Down
2 changes: 2 additions & 0 deletions github-actions/create-pr-for-changes/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47995,6 +47995,7 @@ async function main() {
core.info(`No pre-existing PR found for branch '${branchName}'.`);
}
const { data: { items: supersededPrs } } = await git.github.search.issuesAndPullRequests({
advanced_search: "true",
q: toGithubSearchQuery({
repo: `${repo.owner}/${repo.name}`,
type: "pull-request",
Expand Down Expand Up @@ -48073,6 +48074,7 @@ ${prBody}`;
}
async function cleanUpObsoleteBranches(git, repo, forkRepo, branchPrefix) {
const { data: { items: obsoletePrs } } = await git.github.search.issuesAndPullRequests({
advanced_search: "true",
q: toGithubSearchQuery({
repo: `${repo.owner}/${repo.name}`,
type: "pull-request",
Expand Down