Skip to content
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.

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

Copy shared PR template, encourage changelog updates within PRs #980

Merged
merged 3 commits into from
Jul 14, 2022

Conversation

victorlin
Copy link
Member

Description of proposed changes

Implemented this idea from #975 (comment):

Maybe in the future, it would be good to put changelog updates in individual PRs rather than a bulk collection as part of the release process?

Related issue(s)

Testing

N/A

Earlier commits in this PR encourage changelog updates with individual
PRs, rather than a bulk collection during the release process.

Updated the release process to reflect this new expectation.
@victorlin victorlin requested a review from a team June 17, 2022 23:02
@victorlin victorlin self-assigned this Jun 17, 2022
@victorlin
Copy link
Member Author

victorlin commented Jun 17, 2022

One slight downside: merging a PR will most likely cause changelog merge conflicts on other open PRs. Conflict resolution on a PR would only be temporary if yet another PR gets merged first, so this could be an unnecessary chore for PRs that sit in review for a while. However, the merge conflicts should be trivial to solve.

@fanninpm
Copy link

One slight downside: merging a PR will most likely cause changelog merge conflicts on other open PRs. Conflict resolution on a PR would only be temporary if yet another PR gets merged first, so this could be an unnecessary chore for PRs that sit in review for a while. However, the merge conflicts should be trivial to solve.

I'd recommend taking a look at towncrier, as it was designed to solve this sort of problem.

@tsibley
Copy link
Member

tsibley commented Jul 14, 2022

@fanninpm Thanks for the suggestion. I suspect towncrier adds more process than we want to take on at the moment (compared to editing a single changelog file), but I can see it potentially being adopted in the future.

@victorlin victorlin merged commit 4e6b47e into master Jul 14, 2022
@victorlin victorlin deleted the victorlin/no-bulk-changelog-collection branch July 14, 2022 23:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

3 participants