Merge release/20.3 (20.3-rc-2)

[ParaskP7]

Merging the release branch after doing a new beta.

The new beta included:

• Fix: fix: Workaround Android 12 webview crash WordPress/gutenberg#42517 (via Integrate gutenberg-mobile release 1.79.1 #16925)
• Latest strings.xml for WordPress (d1dbc88)
• ℹ️ New strings.xml files for Jetpack, including new available_languages.xml file (f281a2c + 5593a91)
• Bump version in version.properties (2d235a0)

---

Merge Conflicts:

<<<<<<< merge/release-20.3
    gutenbergMobileVersion = 'v1.79.1'
=======
    gutenbergMobileVersion = 'v1.80.0-alpha3'
>>>>>>> trunk

I kept gutenbergMobileVersion = 'v1.80.0-alpha3', which was in trunk. PS: @fluiddot or @dcalhoun or @derekblank can you please confirm if the conflict resolution is good and that the v1.80.0-alpha3 already has the fix? 🙏

[peril-wordpress-mobile]

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

[wpmobilebot]

You can test the Jetpack changes on this Pull Request by downloading an installable build (jetpack-installable-build-pr16932-332594d.apk), or scanning this QR code:

[wpmobilebot]

You can test the WordPress changes on this Pull Request by downloading an installable build (wordpress-installable-build-pr16932-332594d.apk), or scanning this QR code:

[ParaskP7]

PS: The instrumented-test check is failing due to this wPScreenshotTest test failing (maybe its flaky). 🤔 Cc @jkmassel

[dcalhoun]

I kept gutenbergMobileVersion = 'v1.80.0-alpha3', which was in trunk. PS: @fluiddot or @dcalhoun or @derekblank can you please confirm if the conflict resolution is good and that the v1.80.0-alpha3 already has the fix? 🙏

👋🏻 @ParaskP7. Thanks for the ping.

TL;DR: v1.80.0-alpha3 does not contain the fix, but I still believe we should select v1.80.0-alpha3. Not selecting the alpha release would likely break local, daily development. Additionally, the next scheduled release (1.80.0) has since merged, so WordPress-Android trunk now contains the bug fix.

We have run into this same situation before. Alpha Gutenberg releases represent code changes upon which Gutenberg's daily development depends. We do not make them on specific cadence, but as needed. Removing one (i.e. rolling back to a lower release) would likely cause errors in daily local development. While the alpha release will not contain the latest crash fix, I do not think that is a major concern. The fix will always arrive when we integrate the next scheduled release.

[ParaskP7]

TL;DR: v1.80.0-alpha3 does not contain the fix, but I still believe we should select v1.80.0-alpha3. Not selecting the alpha release would likely break local, daily development. Additionally, the next scheduled release (1.80.0) has #16931 (comment), so WordPress-Android trunk now contains the bug fix.

Great, thanks for the confirmation on selecting v1.80.0-alpha3 @dcalhoun , your clarification makes total sense! 🥇 🙇 👍

[fluiddot]

Hey @ParaskP7, thanks for sharing this and merging the release 🙇 . As @dcalhoun mentioned, the version for solving the conflict should be v1.80.0-alpha3.

TL;DR: v1.80.0-alpha3 does not contain the fix, but I still believe we should select v1.80.0-alpha3. Not selecting the alpha release would likely break local, daily development. Additionally, the next scheduled release (1.80.0) has #16931 (comment), so WordPress-Android trunk now contains the bug fix.

I was checking the commit that was tagged with the alpha version (i.e. v1.80.0-alpha3) and noticed that it was created after the fix was merged, so looks like in this case we'd have all changes, including the bug fix, by using the alpha tag 🎊.

[mokagio]

• versionName rc number and versionCode bumps in build.gradle``version.properties
• string.xml updates

Good to go from a release automation point of view, and from what I make of the comments, also for the conflict resolution

[ParaskP7]

Hey @ParaskP7, thanks for sharing this and merging the release 🙇 . As @dcalhoun mentioned, the version for solving the conflict should be v1.80.0-alpha3.

Thanks for the double confirmation @fluiddot ! 🙇

I was checking the commit that was tagged with the alpha version (i.e. v1.80.0-alpha3) and noticed that it was created after the fix was merged, so looks like in this case we'd have all changes, including the bug fix, by using the alpha tag 🎊.

Oh nice, this is good! 🎉

[ParaskP7]

Thanks for the review and 👍 @mokagio ! 🙇 ❤️ 🚀

[ParaskP7]

👋 @jkmassel !

PS: The instrumented-test check is failing due to this wPScreenshotTest test failing (maybe its flaky). 🤔 Cc @jkmassel

The instrumented-test check is still failing due to wPScreenshotTest. Can/Should we disable this check and/or merge this anyway? 🤔

UPDATE: I ended-up merging it to trunk anyway as I wanted to progress with the final release of 20.3 without having any tasks being pending from the previous beta release of 20.3-rc-2. I hope that's okay... 😊

PS: I also updated this PR with latest trunk. This was my last try... (Buildkite + Firebase Test Lab)