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 release/19.7 (19.7-rc-3) #16406

Merged
merged 7 commits into from
Apr 26, 2022
Merged

Merge release/19.7 (19.7-rc-3) #16406

merged 7 commits into from
Apr 26, 2022

Conversation

AliSoftware
Copy link
Contributor

@AliSoftware AliSoftware commented Apr 26, 2022

Merging the release branch after doing a new beta.

The new beta includes:

Conflicts Resolution

The usual and expected conflict on the gutenbergMobileVersion referenced in the build.gradle, conflicting with the version used on trunk:

<<<<<<< merge/release-19.7
    gutenbergMobileVersion = 'v1.74.1'
=======
    gutenbergMobileVersion = 'v1.75.0-alpha1'
>>>>>>> trunk

As usual, I kept the version on trunk — trusting that the Gutenberg Mobile team will include / cherry pick the fix which shipped in 1.74.1 into a new v1.75.0-alpha* on trunk soon. \cc @geriux

@AliSoftware AliSoftware added the Releases Label related to managing releases label Apr 26, 2022
@AliSoftware AliSoftware added this to the 19.7 ❄️ milestone Apr 26, 2022
@AliSoftware AliSoftware self-assigned this Apr 26, 2022
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Apr 26, 2022

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@AliSoftware AliSoftware marked this pull request as ready for review April 26, 2022 12:53
@AliSoftware AliSoftware requested a review from a team April 26, 2022 12:53
@AliSoftware AliSoftware enabled auto-merge April 26, 2022 12:54
@geriux
Copy link
Contributor

geriux commented Apr 26, 2022

As usual, I kept the version on trunk — trusting that the Gutenberg Mobile team will include / cherry pick the fix which shipped in 1.74.1 into a new v1.75.0-alpha* on trunk soon. \cc @geriux

Sounds good! I'll update it with a new alpha when the beta fix is wrapped. Thanks for the heads up!

@peril-wordpress-mobile
Copy link

You can test the changes on this Pull Request by downloading the APKs:

@AliSoftware AliSoftware merged commit c35747e into trunk Apr 26, 2022
@AliSoftware AliSoftware deleted the merge/release-19.7 branch April 26, 2022 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Releases Label related to managing releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Quote block V2: Crash when changing font size or line height
3 participants