Skip to content

Merge release 1.46.1 to develop #3164

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
Closed
fluiddot wants to merge 17 commits into from
Closed

Merge release 1.46.1 to develop #3164

fluiddot wants to merge 17 commits into from

Conversation

@fluiddot
Copy link
Contributor

@fluiddot fluiddot commented Feb 17, 2021 •
edited
Loading

Brings release 1.46.1 changes back to develop branch.

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 fluiddot added this to the 1.48.0 (16.9) milestone Feb 17, 2021
@fluiddot fluiddot requested a review from ceyhun February 17, 2021 09:11
@fluiddot
Copy link
Contributor Author

fluiddot commented Feb 17, 2021

I wasn't sure about what commit should be referenced in the Gutenberg submodule, I decided to use the hash of the merge commit ("Mobile Release v1.46.1"), is this correct?

@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!

@ceyhun
Copy link
Contributor

ceyhun commented Feb 17, 2021

I wasn't sure about what commit should be referenced in the Gutenberg submodule, I decided to use the hash of the merge commit ("Mobile Release v1.46.1"), is this correct?

I think it's fine as long as gutenberg-mobile is pointing to a commit in gutenberg that is on master branch.

@fluiddot
Merge branch 'develop' into merge_release_1.46.1_to_develop
966d5bb 
# Conflicts:
#	bundle/ios/App.js
#	bundle/ios/App.js.map
#	gutenberg
#	package-lock.json
#	package.json
@fluiddot
Update gutenberg ref
33faaf1
@fluiddot
Update package-lock.json
3eb75fc
@fluiddot
Update bundle
ca9ea26
@fluiddot fluiddot force-pushed the merge_release_1.46.1_to_develop branch from 139d3a4 to ca9ea26 Compare February 19, 2021 09:33
@fluiddot
Copy link
Contributor Author

fluiddot commented Feb 19, 2021

I wasn't sure about what commit should be referenced in the Gutenberg submodule, I decided to use the hash of the merge commit ("Mobile Release v1.46.1"), is this correct?

I think it's fine as long as gutenberg-mobile is pointing to a commit in gutenberg that is on master branch.

Now the Gutenberg reference points to the same value we currently have in develop because it's newer than the previous one I pushed in this PR.

fluiddot
fluiddot commented Feb 19, 2021
View reviewed changes
package-lock.json
"esutils": "^2.0.2"
}
},
"@babel/preset-typescript": {
Copy link
Contributor Author

@fluiddot fluiddot Feb 19, 2021

Choose a reason for hiding this comment

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

I was surprised about this PR adds this but I checked in develop and looks like the package-lock.json is out-dated. I ran npm install in the latest commit on develop and the file was modified 🤷‍♂️ .

@fluiddot
Copy link
Contributor Author

fluiddot commented Feb 19, 2021

This PR is no longer need as the changes from 1.46.1 (as well as 1.46.2) beta fixes were included when merging 1.47.0 version.

@fluiddot fluiddot closed this Feb 19, 2021
@fluiddot fluiddot deleted the merge_release_1.46.1_to_develop branch February 19, 2021 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ceyhun ceyhun Awaiting requested review from ceyhun

Assignees

No one assigned

Labels

release-process

Projects

None yet

Milestone

1.48.0 (16.9)

Development

Successfully merging this pull request may close these issues.

4 participants

@fluiddot @ceyhun @jd-alexander