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 22.1-rc-4 to trunk #18253

Merged
merged 16 commits into from
Apr 12, 2023
Merged

Merge 22.1-rc-4 to trunk #18253

merged 16 commits into from
Apr 12, 2023

Conversation

oguzkocer
Copy link
Contributor

Includes the changes from #18248 and the 20.0.1 hotfix changes from #18251.

We had the following merge conflict:

<<<<<<< HEAD
    gutenbergMobileVersion = 'v1.92.1'
=======
    gutenbergMobileVersion = 'v1.93.0-alpha2'
>>>>>>> origin/trunk

Per usual, I've selected the version from trunk. cc @dcalhoun

dcalhoun and others added 16 commits April 10, 2023 08:32
@dcalhoun
Release script: Update build.gradle gutenbergMobileVersion to ref
cd654f6
@dcalhoun
build: Update Gutenberg ref
d861c10
@dcalhoun
docs: Add release note
b131db0
@dcalhoun
build: Update Gutenberg ref
2148a88
@dcalhoun
Merge pull request #18248 from wordpress-mobile/gutenberg/integrate_r…
740aa15 
…elease_1.92.1

Integrate gutenberg-mobile release 1.92.1
@oguzkocer
Bump version number
100e63a
@irfano
Fix the bold font crash
bc29e94 
Collapsing toolbar was crashing when the "Bold text" is enabled from device's "Display size and text" settings.
@irfano
Revert "Fix the bold font crash"
e1ba01a 
This reverts commit bc29e94.
@irfano
Fix the bold font crash with a better solution
d3d8781 
Collapsing toolbar was crashing when the "Bold text" is enabled from device's "Display size and text" settings.
@irfano
Override fontFamily on some style items to prevent a possible crash
72a9967 
See the previous commit for details.
Merge pull request #18251 from wordpress-mobile/hotfix/bold-text-crash
e4c22e0 
Fix the bold font crash
@oguzkocer
Merge remote-tracking branch 'origin/release/22.1' into merge/22.0.1-…
c88bd8a 
…to-release-22.1
@oguzkocer
Merge pull request #18252 from wordpress-mobile/merge/22.0.1-to-relea…
38123b2 
…se-22.1

Merge 22.0.1 hotfix to release/22.1
@oguzkocer
Update translations
43222e9
@oguzkocer
Bump version number
71264a2
@oguzkocer
Merge remote-tracking branch 'origin/trunk' into merge/22.1-rc-4-to-t…
4674d4c 
…runk
@oguzkocer oguzkocer added the Releases Label related to managing releases label Apr 11, 2023
@oguzkocer oguzkocer added this to the 22.2 milestone Apr 11, 2023
@oguzkocer oguzkocer requested a review from a team April 11, 2023 03:42
@oguzkocer oguzkocer enabled auto-merge April 11, 2023 03:42
@wpmobilebot
Copy link
Contributor

WordPress📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
App NameWordPress WordPress
FlavorJalapeno
Build TypeDebug
Versionpr18253-4674d4c
Commit4674d4c
Direct Downloadwordpress-prototype-build-pr18253-4674d4c.apk
 Note: Google Login is not supported on these builds.

@wpmobilebot
Copy link
Contributor

Jetpack📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
App NameJetpack Jetpack
FlavorJalapeno
Build TypeDebug
Versionpr18253-4674d4c
Commit4674d4c
Direct Downloadjetpack-prototype-build-pr18253-4674d4c.apk
 Note: Google Login is not supported on these builds.

dcalhoun
dcalhoun reviewed Apr 11, 2023
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.

Per usual, I've selected the version from trunk. cc @dcalhoun

The correct selection. 👍🏻 In this specific occurrence, the v1.93.0-alpha2 tag also includes the fix within v1.92.1 too. 🥳

@oguzkocer
Copy link
Contributor Author

FYI: The instrumented tests in this release branch have been consistently failing. There is not much we can (or should?) do about that until the next release branch is created. So, please ignore that failure.

mokagio
mokagio approved these changes Apr 12, 2023
View reviewed changes
Copy link
Contributor

@mokagio mokagio left a comment

Choose a reason for hiding this comment

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

  • versionName rc number and versionCode bumps in version.properties
  • string.xml updates
  • Diffs from the PRs that made it into this beta

@oguzkocer oguzkocer merged commit e9b0b04 into trunk Apr 12, 2023
@oguzkocer oguzkocer deleted the merge/22.1-rc-4-to-trunk branch April 12, 2023 00:48
@thomashorta thomashorta mentioned this pull request Apr 12, 2023
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dcalhoun dcalhoun dcalhoun left review comments

@mokagio mokagio mokagio approved these changes

Assignees
No one assigned
Labels
Releases Label related to managing releases
Projects
None yet
Milestone
22.2
Development

Successfully merging this pull request may close these issues.
5 participants
@oguzkocer @wpmobilebot @dcalhoun @mokagio @irfano