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

Use individual files for changelog entries #1559

Merged

Conversation

dominiklohmann
Copy link
Member

📔 Description

This helps avoid merge conflicts in the CHANGELOG.md file by generating it.

📝 Checklist

  • All user-facing changes have changelog entries.
  • The changes are reflected on docs.tenzir.com/vast, if necessary.
  • The PR description contains instructions for the reviewer, if necessary.

🎯 Review Instructions

Commit-by-commit.

@dominiklohmann dominiklohmann added maintenance Tasks for keeping up the infrastructure refactoring Restructuring of existing code labels Apr 19, 2021
@dominiklohmann dominiklohmann requested a review from a team April 19, 2021 15:03
@dominiklohmann dominiklohmann force-pushed the story/ch23919/individual-files-for-changelog-entries branch 2 times, most recently from e91908d to 165c826 Compare April 19, 2021 15:37
@dominiklohmann dominiklohmann marked this pull request as ready for review April 19, 2021 15:37
@dominiklohmann dominiklohmann force-pushed the story/ch23919/individual-files-for-changelog-entries branch 2 times, most recently from b3bcf6f to 48729fa Compare April 19, 2021 16:37
@mavam
Copy link
Member

mavam commented Apr 19, 2021

Is this adding a separate commit to master with every merge?

@dominiklohmann
Copy link
Member Author

Is this adding a separate commit to master with every merge?

For every merge that adds a changelog entry, yes. The alternative would be not to have a readable changelog file in the repository that we can link to. That we do regularly, hence the workflow.

@mavam
Copy link
Member

mavam commented Apr 20, 2021

How about we just update the changelog with every release? It wouldn't change the logic you have in place, but reduce commit churn by quite a bit.

Or an alternative: amend the merge commit.

@dominiklohmann
Copy link
Member Author

How about we just update the changelog with every release? It wouldn't change the logic you have in place, but reduce commit churn by quite a bit.

I don't see the issue, really. It's one commit per merge immediately after merging a PR, which is less than one a day. It really doesn't add much noise.

We use a pinned VAST version internally that is not tied to our release cycle. If we update on every release only, we lose the ability to just click on the submodule and easily see the most recent changes.

Or an alternative: amend the merge commit.

Not an option. Let's not get into the business of force-pushing to our default branch.

Copy link
Member Author

@dominiklohmann dominiklohmann left a comment

Choose a reason for hiding this comment

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

Peer-reviewed with @tobim.

cmake/VASTChangelog.cmake.in Outdated Show resolved Hide resolved
cmake/VASTChangelog.cmake.in Outdated Show resolved Hide resolved
cmake/VASTChangelog.cmake.in Outdated Show resolved Hide resolved
.github/workflows/changelog.yaml Show resolved Hide resolved
@dominiklohmann dominiklohmann force-pushed the story/ch23919/individual-files-for-changelog-entries branch from ec150c7 to 4b17019 Compare April 20, 2021 08:36
@dominiklohmann dominiklohmann force-pushed the story/ch23919/individual-files-for-changelog-entries branch from 4b17019 to d0067cc Compare April 20, 2021 08:39
@dominiklohmann dominiklohmann merged commit 0d29298 into master Apr 20, 2021
@dominiklohmann dominiklohmann deleted the story/ch23919/individual-files-for-changelog-entries branch April 20, 2021 09:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance Tasks for keeping up the infrastructure refactoring Restructuring of existing code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants