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.

Sign up for GitHub

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

Jump to bottom

Merge release-v4.9 branch #4352

Merged
merged 23 commits into from
Jun 14, 2023
Merged

Merge release-v4.9 branch #4352

merged 23 commits into from
Jun 14, 2023

Conversation

ernestognw
Copy link
Member

Merging changes from release-v4.9

github-actions bot and others added 19 commits May 9, 2023 19:41
@github-actions
Start release candidate
2d2c5f3
@frangio
Specify changeset PRs manually
43eb8d1 
(cherry picked from commit dff520a)
@github-actions
Release v4.9.0 (rc) (#4228)
17cf519 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@frangio
Disable code size warnings on exposed contracts
f214e47 
(cherry picked from commit d095542)
@Amxx @frangio
Fix spelling error in CHANGELOG.md (#4232)
46d5a87 
Co-authored-by: Francisco Giordano <fg@frang.io>
@frangio
Clean up pending admin schedule on renounce in DefaultAdminRules (#4230)
9673c56 
(cherry picked from commit 3e1b25a)
@frangio
Prevent attempt to publish to npm (#4239)
652ae92 
(cherry picked from commit f355bd3)
@Amxx @frangio
Fix bug allowing anyone to cancel an admin renounce (#4238)
e0fe936 
Co-authored-by: Francisco Giordano <fg@frang.io>
(cherry picked from commit 3ec4307)
@frangio
Reduce frequency of version comment updates (#4244)
a43069e 
(cherry picked from commit 1642b66)
@github-actions
Release v4.9.0 (rc) (#4243)
4f7047c 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@github-actions
Exit release candidate
813cc2b
@github-actions @frangio
Release v4.9.0 (#4272)
54b3f14 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Francisco <fg@frang.io>
@frangio
Fix release merge script (#4273)
a6e2671 
Co-authored-by: Ernesto García <ernestognw@gmail.com>
(cherry picked from commit 7e814a3)
@qiweiii @frangio
Fix doc MyGovernor example doesn't compile (#4282)
8198205 
Co-authored-by: Francisco Giordano <fg@frang.io>
@frangio
Fix import substitution for docs examples
4e6deb3
@JulissaDantes @frangio
Fix typo in crosschain.adoc
fa3a30a
@Amxx @frangio
Merge pull request from GHSA-5h3x-9wvq-w4m2
33ff9b0 
Co-authored-by: Francisco <fg@frang.io>
Co-authored-by: Ernesto García <ernestognw@gmail.com>
(cherry picked from commit d947432)
@github-actions @frangio
Release v4.9.1 (#4321)
281550b 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Francisco <fg@frang.io>
@zackrw @frangio
Update index.adoc (#4336)
ded8c9e 
Co-authored-by: Ernesto García <ernestognw@gmail.com>
(cherry picked from commit d6c7cee)
@ernestognw ernestognw requested review from frangio and Amxx June 14, 2023 16:57
@changeset-bot
Copy link

changeset-bot bot commented Jun 14, 2023 •
edited
Loading

⚠️ No Changeset found

Latest commit: ec47548

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@Amxx
Copy link
Collaborator

Amxx commented Jun 14, 2023

Most of the changeset removal are part of 5.0 and should be kept

@ernestognw ernestognw force-pushed the merge/release-v4.9 branch 3 times, most recently from dd7bfb9 to 579dcdb Compare June 14, 2023 17:53
@ernestognw ernestognw force-pushed the merge/release-v4.9 branch from 579dcdb to 9fb37a7 Compare June 14, 2023 19:26
@ernestognw
Copy link
Member Author

The merge resolution was kind of difficult. My conclusion is that we can't correctly automate the merge back of this because there are multiple cases in which we need manual resolution and I actually think it's dangerous to even keep this last release cycle automation.

We can discuss it later. Currently is ready for review.

@ernestognw ernestognw requested a review from frangio June 14, 2023 19:34
frangio
frangio reviewed Jun 14, 2023
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@ernestognw @frangio
Update CHANGELOG.md
ec47548 
Co-authored-by: Francisco <fg@frang.io>
frangio
frangio approved these changes Jun 14, 2023
View reviewed changes
Copy link
Contributor

@frangio frangio left a comment

Choose a reason for hiding this comment

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

LGTM

@frangio frangio enabled auto-merge (squash) June 14, 2023 19:51
@frangio frangio merged commit ac5480e into master Jun 14, 2023
@frangio frangio deleted the merge/release-v4.9 branch June 14, 2023 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frangio frangio frangio approved these changes

@Amxx Amxx Awaiting requested review from Amxx

Assignees
No one assigned
Labels
ignore-changeset
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ernestognw @Amxx @frangio @qiweiii @JulissaDantes @zackrw