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

Merge Master -> Develop 1.28.1 #2313

Merged
merged 21 commits into from
May 26, 2020
Merged

Conversation

mchowning
Copy link
Contributor

Merge master to develop with 1.28.1 release

Had to create a new branch to resolve conflicts. There were conflicts in the bundle files, so I just generated new bundles.

PR submission checklist:

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

@mchowning mchowning added this to the 1.29 milestone May 25, 2020
@mchowning mchowning requested a review from SergioEstevao May 25, 2020 20:35
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented May 25, 2020

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

@mchowning
Copy link
Contributor Author

👋 @SergioEstevao . Please take a look at c30e2fa and make sure I resolved the Podfile conflict the right way.

@mchowning mchowning marked this pull request as draft May 25, 2020 20:36
@mchowning
Copy link
Contributor Author

Marking this as a draft until we have a WPAndroid PR ready to go with the matching changes for 1.28.1.

Copy link
Contributor

@SergioEstevao SergioEstevao left a comment

Choose a reason for hiding this comment

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

I smoke tested on iOS and Android and is looking good.

@SergioEstevao SergioEstevao marked this pull request as ready for review May 25, 2020 22:05
@mchowning
Copy link
Contributor Author

mchowning commented May 26, 2020

I can locally recreate the failure that is showing with the Android device tests on CI. It is with a new test I added for 1.28.1. I'm not sure why it is failing now that develop has been merged in, when it didn't fail on either of the previous two PRs with these changes (#2279, #2310).

The issue is that when the device test sends a "\n" to a list block, it creates a new list item but does not move the cursor to the new list item. If I manually execute the test, everything works as it should (pressing "Enter" creates a new list item and moves the cursor to the new list item). I haven't had time to investigate this much, but I will pick it up first thing in the morning.

I know we need to get this merged in order to create the 1.29.0 release branches. One way we could not make this test block us would be to disable the failing test, and create an issue to fix that test. Either way, I'll look into it first thing tomorrow.

@SergioEstevao SergioEstevao merged commit a4419c3 into develop May 26, 2020
@SergioEstevao SergioEstevao deleted the master_develop_1.28.1_merge branch May 26, 2020 13:23
@SergioEstevao SergioEstevao restored the master_develop_1.28.1_merge branch May 26, 2020 13:24
@SergioEstevao SergioEstevao deleted the master_develop_1.28.1_merge branch May 26, 2020 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants