{{ message }}
Repository navigation
build: filter out duplicate cherry-picked commits in changelog - #37956
Closed
devversion wants to merge 2 commits into
Closed
devversion wants to merge 2 commits into
devversion wants to merge 2 commits into
Conversation
devversion
added
area: build & ci
devversion
marked this pull request as ready for review
July 7, 2020 16:29
devversion
force-pushed
the
build/dedupe-changelog-existing-commits
branch
from
July 7, 2020 16:29
dadbad2 to
01fa8ce
Compare
josephperrott
approved these changes
Jul 7, 2020
josephperrott
left a comment
josephperrott
left a comment
Member
There was a problem hiding this comment.
LGTM, one nit to take a look at if you want.
jelbourn
added
action: merge
Often changelogs are generated from the patch branch and then cherry-picked into the `CHANGELOG.md` file in `master` for better access and readability. This is problematic though as `conventional-changelog` (the tool we use for generating the changelog), will duplicate commits when a future changelog is generated from `master` then (i.e. for a new minor release). This happens because conventional-changelog always generates the changelog from the latest tag in a given branch to `HEAD`. The tag in the patch branch does not correspond to any SHA in `master` so the intersection of commits is not automatically omitted. We work around this naively (until we have a better tool provided by dev-infra), by deduping commits that are already part of the changelog. This has proven to work as expected in the components repo.
More explicit boolean expression
devversion
force-pushed
the
build/dedupe-changelog-existing-commits
branch
from
July 8, 2020 06:09
01fa8ce to
0606ae1
Compare
alxhub
pushed a commit
that referenced
this pull request
Jul 8, 2020
Often changelogs are generated from the patch branch and then cherry-picked into the `CHANGELOG.md` file in `master` for better access and readability. This is problematic though as `conventional-changelog` (the tool we use for generating the changelog), will duplicate commits when a future changelog is generated from `master` then (i.e. for a new minor release). This happens because conventional-changelog always generates the changelog from the latest tag in a given branch to `HEAD`. The tag in the patch branch does not correspond to any SHA in `master` so the intersection of commits is not automatically omitted. We work around this naively (until we have a better tool provided by dev-infra), by deduping commits that are already part of the changelog. This has proven to work as expected in the components repo. PR Close #37956
profanis
pushed a commit
to profanis/angular
that referenced
this pull request
Sep 5, 2020
…ar#37956) Often changelogs are generated from the patch branch and then cherry-picked into the `CHANGELOG.md` file in `master` for better access and readability. This is problematic though as `conventional-changelog` (the tool we use for generating the changelog), will duplicate commits when a future changelog is generated from `master` then (i.e. for a new minor release). This happens because conventional-changelog always generates the changelog from the latest tag in a given branch to `HEAD`. The tag in the patch branch does not correspond to any SHA in `master` so the intersection of commits is not automatically omitted. We work around this naively (until we have a better tool provided by dev-infra), by deduping commits that are already part of the changelog. This has proven to work as expected in the components repo. PR Close angular#37956
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Often changelogs are generated from the patch branch and then
cherry-picked into the
CHANGELOG.mdfile inmasterforbetter access and readability. This is problematic though as
conventional-changelog(the tool we use for generating thechangelog), will duplicate commits when a future changelog
is generated from
masterthen (i.e. for a new minor release).This happens because conventional-changelog always generates the
changelog from the latest tag in a given branch to
HEAD. Thetag in the patch branch does not correspond to any SHA in
masterso the intersection of commits is not automatically omitted.
We work around this naively (until we have a better tool provided
by dev-infra), by deduping commits that are already part of the
changelog. This has proven to work as expected in the components
repo.