Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

fix(repo/finalize): prune with different base branches #31357

Merged
merged 2 commits into from
Sep 12, 2024
Merged

fix(repo/finalize): prune with different base branches #31357

merged 2 commits into from
Sep 12, 2024

Conversation

viceice
Copy link
Member

@viceice viceice commented Sep 12, 2024

Changes

  • pass correct baseBranch to PR targetBranch
  • extract correct baseBranch from branchName

Context

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

rarkins
rarkins reviewed Sep 12, 2024
View reviewed changes
Copy link
Collaborator

@rarkins rarkins left a comment

Choose a reason for hiding this comment

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

Could this be derisked by bypassing all new logic whenever baseBranches is not configured?

@viceice
Copy link
Member Author

viceice commented Sep 12, 2024

Could this be derisked by bypassing all new logic whenever baseBranches is not configured?

what do you mean? the calculate function returns null if no base branches are configured. then the default branch is used as before.

@viceice viceice added this pull request to the merge queue Sep 12, 2024
Merged via the queue into main with commit 159927b Sep 12, 2024
38 checks passed
@viceice viceice deleted the fix/branch-pruning branch September 12, 2024 11:56
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 38.77.2 🎉

The release is available on:

Your semantic-release bot 📦🚀

# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@rarkins rarkins rarkins approved these changes

@secustor secustor Awaiting requested review from secustor

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Renovate doesn't prune branches which don't target default branch
3 participants
@viceice @renovate-release @rarkins