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 1.46.1 beta fix release to 1.47.0 #3159

Merged
merged 18 commits into from
Feb 17, 2021
Merged

Merge 1.46.1 beta fix release to 1.47.0 #3159

merged 18 commits into from
Feb 17, 2021

Conversation

fluiddot
Copy link
Contributor

@fluiddot fluiddot commented Feb 16, 2021 •
edited
Loading

This PR includes the changes that were included in the 1.46.1 beta fix into the release 1.47.0.

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered if this change warrants user-facing release notes more info and have added them to RELEASE-NOTES.txt if necessary.

fluiddot and others added 15 commits February 15, 2021 13:58
@fluiddot
Release script: Update gb mobile version to 1.46.1
cbbe8b7
@fluiddot
Release script: Update gutenberg ref
a0197f4
@fluiddot
Release script: Update bundle for: 1.46.1
c7073ad
@ceyhun
Update gutenberg ref
02bd218
@ceyhun
Update bundles
7030a69
@fluiddot
Update gutenberg ref
a5e277c
@fluiddot
Update release notes
addad09
@ceyhun
Merge branch 'release/1.46.1' into feat/show-hide-audio-block
33e3b1c
@jd-alexander
Merge pull request #3129 from wordpress-mobile/feat/show-hide-audio-b…
23569f3 
…lock

Add capability to bridge to show/hide audio block
@fluiddot
Update gutenberg ref and release notes
065ac53
@fluiddot
Update bundles
bc73804
@fluiddot
Update release notes
66d2b27
@fluiddot
Merge branch 'release/1.47.0' into merge_release_1.46.1_to_1.47.0
9db5b81 
# Conflicts:
#	bundle/ios/App.js
#	bundle/ios/App.js.map
#	gutenberg
#	package-lock.json
#	package.json
@fluiddot
Update gutenberg ref
0474224
@fluiddot
Update bundle
3032fd3
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Feb 17, 2021 •
edited
Loading

Wanna run full suite of Android and iOS UI tests? Click here and 'Approve' CI job!

@fluiddot
Copy link
Contributor Author

The Gutenberg reference points to the latest commit from rnmobile/merge_release_1.46.1_to_1.47.0, once the Gutenberg PR gets merged we have to update that reference to the merge commit.

@fluiddot
Copy link
Contributor Author

I also spotted that the Jetpack reference was pointing to an older commit:

From 60f41b to 609c99

It's weird because on develop branch the Jetpack reference is also the old one but it shouldn't because a PR modified it (actually the one that originated including the extra changes in 1.46.1) a couple of weeks ago.

@fluiddot fluiddot added this to the 1.47 (16.8) milestone Feb 17, 2021
@fluiddot fluiddot marked this pull request as ready for review February 17, 2021 12:21
antonis
antonis approved these changes Feb 17, 2021
View reviewed changes
Copy link

@antonis antonis left a comment

Choose a reason for hiding this comment

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

LGTM 🎉

dcalhoun
dcalhoun requested changes Feb 17, 2021
View reviewed changes
Copy link
Member

@dcalhoun dcalhoun left a comment

Choose a reason for hiding this comment

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

Still looking into why, but I am seeing this error when loading the demo app locally from gutenberg-mobile.

rn-bridge-error

This was referenced Feb 17, 2021
Merged
Merged
dcalhoun
dcalhoun approved these changes Feb 17, 2021
View reviewed changes
Copy link
Member

@dcalhoun dcalhoun left a comment •
edited
Loading

Choose a reason for hiding this comment

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

🎉 LGTM now that we have a fix included for the RN error seen previously. I suppose the last steps are merging the sibling gutenberg PR and updating the ref here before merging this one.

@fluiddot
Copy link
Contributor Author

🎉 LGTM now that we have a fix included for the RN error send previously. I suppose the last steps are merging the sibling gutenberg PR and updating the ref here before merging this one.

Yeah exactly.

@dcalhoun dcalhoun merged commit e8e52f6 into release/1.47.0 Feb 17, 2021
@dcalhoun dcalhoun deleted the merge_release_1.46.1_to_1.47.0 branch February 17, 2021 19:42
@dcalhoun dcalhoun mentioned this pull request Feb 17, 2021
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@antonis antonis antonis approved these changes

@dcalhoun dcalhoun dcalhoun approved these changes

@ceyhun ceyhun Awaiting requested review from ceyhun

Assignees
No one assigned
Labels
release-process
Projects
None yet
Milestone
1.47 (16.8)
Development

Successfully merging this pull request may close these issues.
5 participants
@fluiddot @antonis @dcalhoun @ceyhun @jd-alexander