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

Update the changelog when creating an RC #10795

Merged
merged 4 commits into from
Apr 2, 2021

Conversation

Gudahtt
Copy link
Member

@Gudahtt Gudahtt commented Apr 1, 2021

The changelog will now be automatically updated when a release branch is created. A new release header along with changelog entries for any new commits will be added.

Note that this changelog will still need to be manually cleaned up, but it's one less manual step at least.

The old Bash script for adding a new release header to the changelog has been removed, as that functionality is now built into the changelog update script.

A new script has been added to commit any changes made to the manifest and changelog. This step used to happen at the end of the bump manifest version script, but now the changelog update relies upon the manifest version bump happening first, so it needed to be re-ordered. The changes should only be committed on the first run of the branch, as it's contingent upon the manifest changing (due to the version bump). Further changelog updates won't trigger new automatic commits.

Relates to #10752

Manual testing steps:

  • Create a new release branch
  • See that it updates the changelog automatically

@Gudahtt
Copy link
Member Author

Gudahtt commented Apr 1, 2021

This depends upon #10794

@metamaskbot
Copy link
Collaborator

Builds ready [e0bf1cc]
Page Load Metrics (665 ± 62 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint458559105
domContentLoaded35885966412962
load35986166512962
domInteractive35785966312962

@Gudahtt Gudahtt force-pushed the add-release-header-when-updating-changelog branch from 5ed8808 to ddfd922 Compare April 1, 2021 15:28
@Gudahtt Gudahtt force-pushed the update-changelog-when-creating-RC branch from e0bf1cc to e7c7055 Compare April 1, 2021 15:30
@metamaskbot
Copy link
Collaborator

Builds ready [e7c7055]
Page Load Metrics (549 ± 43 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint43715394
domContentLoaded3306725479043
load3366735498943
domInteractive3306725468943

Base automatically changed from add-release-header-when-updating-changelog to develop April 1, 2021 23:39
@Gudahtt Gudahtt force-pushed the update-changelog-when-creating-RC branch from e7c7055 to 79b8ed5 Compare April 2, 2021 01:24
@Gudahtt Gudahtt marked this pull request as ready for review April 2, 2021 01:24
@Gudahtt Gudahtt requested review from kumavis and a team as code owners April 2, 2021 01:24
@Gudahtt Gudahtt requested a review from brad-decker April 2, 2021 01:24
@metamaskbot
Copy link
Collaborator

Builds ready [79b8ed5]
Page Load Metrics (559 ± 37 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint43725894
domContentLoaded3746755577737
load3766765597737
domInteractive3746755577737

@Gudahtt Gudahtt force-pushed the update-changelog-when-creating-RC branch from 79b8ed5 to 0402931 Compare April 2, 2021 15:08
@metamaskbot
Copy link
Collaborator

Builds ready [0402931]
Page Load Metrics (571 ± 40 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint44725694
domContentLoaded3736615708340
load3756635718340
domInteractive3736615708340

Copy link
Member

@rekmarks rekmarks left a comment

Choose a reason for hiding this comment

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

Looks good except for a typo.

.circleci/scripts/release-commit-verison-bump.sh Outdated Show resolved Hide resolved
The changelog will now be automatically updated when a release branch
is created. A new release header along with changelog entries for any
new commits will be added.

Note that this changelog will still need to be manually cleaned up, but
it's one less manual step at least.

The old Bash script for adding a new release header to the changelog
has been removed, as that functionality is now built into the changelog
update script.

A new script has been added to commit any changes made to the manifest
and changelog. This step used to happen at the end of the bump manifest
version script, but now the changelog update relies upon the manifest
version bump happening first, so it needed to be re-ordered. The
changes should only be committed on the first run of the branch, as
it's contingent upon the manifest changing (due to the version bump).
Further changelog updates won't trigger new automatic commits.
@Gudahtt Gudahtt force-pushed the update-changelog-when-creating-RC branch from 0402931 to 02ad6c8 Compare April 2, 2021 20:39
rekmarks
rekmarks previously approved these changes Apr 2, 2021
Copy link
Member

@rekmarks rekmarks left a comment

Choose a reason for hiding this comment

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

LGTM!

@Gudahtt
Copy link
Member Author

Gudahtt commented Apr 2, 2021

I've just created the branch Version-v9.3.1 to test this, just to double check that it all works 👀

@rekmarks
Copy link
Member

rekmarks commented Apr 2, 2021

ffffuuuuuuu

@lavamoat/allow-scripts automatically updating configuration

removing unneeded configuration for packages:
- fsevents
Done in 2.65s.
allow-scripts configuration requires updates

The check for manifest changes was wrong on two counts. Firstly it was
supposed to check that there *are* changes, but instead it was bailing
if there were *no* changes (the opposite of what was intended). Second,
it was including changelog changes as well, when it should have only
considered manifest changes.
@Gudahtt
Copy link
Member Author

Gudahtt commented Apr 2, 2021

It worked! d6b5abd

... after fixing a couple more mistakes 😅 . I put each bug fix in a separate commit - check out the most recent two since your approval to see what they were.

@Gudahtt
Copy link
Member Author

Gudahtt commented Apr 2, 2021

That status check shouldn't affect this PR thankfully, because this isn't a release branch. It was only triggered because this commit was used in a release branch. GitHub applies these status checks by commit it seems, not by branch.

Copy link
Member

@rekmarks rekmarks left a comment

Choose a reason for hiding this comment

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

Alright, now it looks good!

@metamaskbot
Copy link
Collaborator

Builds ready [c6c5daa]
Page Load Metrics (513 ± 38 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint43715284
domContentLoaded3416025117938
load3436035137938
domInteractive3416025117938

@Gudahtt Gudahtt merged commit 6878035 into develop Apr 2, 2021
@Gudahtt Gudahtt deleted the update-changelog-when-creating-RC branch April 2, 2021 21:11
@github-actions github-actions bot locked and limited conversation to collaborators Apr 2, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants