Skip to content

feat(bitbucket): add support for pull request description merging #5350

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

Jump to bottom
Merged
merged 1 commit into from
Jun 10, 2025
Merged

feat(bitbucket): add support for pull request description merging #5350

merged 1 commit into from
Jun 10, 2025

Conversation

mcwarman
Copy link
Member

@mcwarman mcwarman commented Jun 8, 2025 •
edited
Loading

Fix #5174

Merges markdown pipeline and targets output together.

Uses goldmark ast to parse the markdown.

It makes assumptions about the format, and possibly has edge cases missed. That might come out in the wild.

Also fix a bug with #5309 that doesn't support more than one item in the list.

Test

To test this pull request, you can run the following commands:

cd pkg/core/reports
go test
go build -o bin/updatecli
export BITBUCKET_TOKEN="xxx"
# update scm.yaml to hit test repo etc.
bin/updatecli --config e2e/updatecli.d/success.d/bitbucket/scm.yaml --debug apply
# update scm.yaml to change Target and PR Title
bin/updatecli --config e2e/updatecli.d/success.d/bitbucket/scm.yaml --debug apply

Additional Information

Checklist

  • I have updated the documentation via pull request in website repository.

Tradeoff

Potential improvement

@mcwarman mcwarman requested a review from olblak June 8, 2025 20:14
@mcwarman mcwarman changed the title feat(bitbucket): add support for pull request description merging" feat(bitbucket): add support for pull request description merging Jun 8, 2025
@mcwarman mcwarman marked this pull request as ready for review June 8, 2025 20:17
@mcwarman
Copy link
Member Author

mcwarman commented Jun 8, 2025 •
edited
Loading

This is arguably an annoying change. because there's no way to merge previously created PRs:

image

Probably just a simple release note saying that it will cause outputs like this, with two options ignoring or close, delete branch, and recreate.

@mcwarman mcwarman force-pushed the feat/bibucket-pr-description-merge branch from c6db5b0 to ce628cc Compare June 8, 2025 20:34
@olblak
Copy link
Member

olblak commented Jun 10, 2025

This is arguably an annoying change. because there's no way to merge previously created PRs:

Just to clarify, any PR created before this change won't be handled, right?
If that's what you mean, then it's totally fine.

olblak
olblak approved these changes Jun 10, 2025
View reviewed changes
Copy link
Member

@olblak olblak left a comment

Choose a reason for hiding this comment

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

Nice pull request and thank for the tests

@olblak olblak added enhancement New feature or request scm-bitbucket All things related to the bitbucket integration labels Jun 10, 2025
@olblak olblak merged commit d8ee028 into updatecli:main Jun 10, 2025
6 checks passed
@mcwarman
Copy link
Member Author

This is arguably an annoying change. because there's no way to merge previously created PRs:

Just to clarify, any PR created before this change won't be handled, right?

If that's what you mean, then it's totally fine.

Yeah, exactly if it's been created before this realise it will cause the output in the screenshot on subsequent updates.

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

@olblak olblak olblak approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request scm-bitbucket All things related to the bitbucket integration
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Feature Request: Allow to merge bitbucket pullrequest body
2 participants
@mcwarman @olblak