Skip to content

Conversation

@devversion
Copy link
Member

Currently publishing fails if a pre-release is cut for an upcoming
major/minor. This is because the next release-train has some
special logic where its version is already bumped, but the
version has not been released. Our release notes logic currently
when building a pre-release for next, looks for a tag named
similar to the version in the package.json. This will always fail.

To fix this, we consult the release trains for building up
the Git range that is used for the release notes. We still
rely on tags, but we determine the tags from the active release
trains (which is more robust than relying on the package json value).

For the special next release-train situation, we build up the
release notes from the most recent patch to HEAD of next. While
doing this, we also dedupe any commits that have already landed in
patch, RC, or FF releases.

Copy link
Member

@josephperrott josephperrott left a comment

Choose a reason for hiding this comment

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

Overall LGTM

Probably worth having @clydin and/or @AndrewKushnir take a look as well.

@devversion devversion requested a review from jelbourn August 6, 2021 18:01
@google-cla

This comment has been minimized.

@google-cla google-cla bot added cla: no and removed cla: yes labels Aug 11, 2021
@google-cla
Copy link

google-cla bot commented Aug 11, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@josephperrott josephperrott added the action: review The PR is still awaiting reviews from at least one requested reviewer label Aug 11, 2021
@devversion devversion force-pushed the release-tool-notes-fix branch from 46bcb8e to 80442fb Compare August 11, 2021 19:21
@google-cla google-cla bot added cla: yes and removed cla: no labels Aug 11, 2021
@devversion devversion force-pushed the release-tool-notes-fix branch 2 times, most recently from be690d5 to 0d07ec3 Compare August 11, 2021 19:35
Copy link
Member

@josephperrott josephperrott left a comment

Choose a reason for hiding this comment

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

LGTM

@devversion devversion force-pushed the release-tool-notes-fix branch from 0d07ec3 to 672a1fd Compare August 12, 2021 12:59
Currently publishing fails if a pre-release is cut for an upcoming
major/minor. This is because the `next` release-train has some
special logic where its version is already bumped, but the
version has not been released. Our release notes logic currently
when building a pre-release for next, looks for a tag named
similar to the version in the `package.json`. This will always fail.

To fix this, we consult the release trains for building up
the Git range that is used for the release notes. We still
rely on tags, but we determine the tags from the active release
trains (which is more robust than relying on the package json value).

For the special `next` release-train situation, we build up the
release notes from the most recent patch to `HEAD` of next. While
doing this, we also dedupe any commits that have already landed in
patch, RC, or FF releases.
@devversion devversion force-pushed the release-tool-notes-fix branch from 672a1fd to 3fd550c Compare August 12, 2021 13:06
@devversion devversion merged commit f10879a into angular:main Aug 12, 2021
@devversion
Copy link
Member Author

@jelbourn I've merged this to unblock other work on the release tool (and to make the tool usable as soon as possible). I'd still appreciate your review on the PR when you get time (especially on the tests for the changelog generation). No rush.

@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 12, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

action: review The PR is still awaiting reviews from at least one requested reviewer

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants