Merge changes from beta 20.7.0.1, hotfix 20.6.1, editorialized release notes, and beta 20.7.0.2 #19294

mokagio · 2022-09-07T05:50:50Z

20.7.0.1

Notice that a new beta wasn't necessary because, so far, we only had changes to the release notes and the release automation.

The reason I'm shipping one, though, is that the Jetpack 20.7.0.0 binary was rejected during TestFlight review with:

ITMS-90433: Invalid Swift Support - The file libswift_Concurrency.dylib doesn't have the correct code signature. Make sure you're using the correct signature, rebuild your app using the current public (GM) version of Xcode, and resubmit it. Don't just modify the code signature of libswift_Concurrency.dylib.

I think/hope this was a random TestFlight issue, but the only way to verify is to submit a new binary, with a new version, for review. I don't want to leave this verification till later in the release cycle in case the issue is legitimately on our end.

20.7.0.2

This PR was still open when new changes landed in the release branch after 20.7.0.1, so I queue 20.7.0.2 to it.

Includes:

Updates to the localization files (.strings and Fastlane metadata) automatically pulled for the new translations that have already been approved in GlotPress
Version update in .xcconfig
Diffs from the PRs that made it into this beta

This makes the lane parameter using the same name as the `buildkite_trigger_build` action, avoiding confusion in the rare cases we need to call it manually. If you called the `trigger_release_build` or `trigger_beta_build` lane without a parameter, you'll get prompted to pass a `branch` one, by the underlying `buildkite_trigger_build` action. But if you next time called the lane with a `branch` parameter, you'd still get prompted to pass one, because the lane expected `branch_to_build` , but this was not made clear by the messages Fastlane prompted. Rather than adding extra code for this, I thought aligning the parameters name would sort out the issue. This leans a bit into the convention over configuration realm, though. There's nothing stopping future developers to reintroduce the same confusion by renaming the parameter either at the lane or action level. Given the limited userbase of this code and the relative slow pace at which it changes, I think that's an acceptable tradeoff to have convenience for the time being.

See conversation at https://github.com/wordpress-mobile/WordPress-iOS/pull/19281/files#r962698176

This makes the code a tiny bit clearer.

…-parameters-names-in-buildkite-actions

…elease_1.81.2 Integrate gutenberg-mobile release 1.81.2

Got conflicts in the `Podfile` and `Podfile.lock` and the version `xcconfig` files. As usual with hotfixes, I resolved the version conflict by keeping the release version value, 20.7. For the pod conflict, that was between Gutenberg 1.81.2 and 1.82.0. I kept 1.82.0 under the assumption the fix in 1.81.2 will land in the 1.82.x release series soon.

wpmobilebot · 2022-09-07T06:11:46Z

You can test the changes in Jetpack from this Pull Request by:

Clicking here or scanning the QR code below to access App Center
Then installing the build number pr19294-ff9ed6f on your iPhone

If you need access to App Center, please ask a maintainer to add you.

wpmobilebot · 2022-09-07T06:15:28Z

You can test the changes in WordPress from this Pull Request by:

Clicking here or scanning the QR code below to access App Center
Then installing the build number pr19294-ff9ed6f on your iPhone

If you need access to App Center, please ask a maintainer to add you.

peril-wordpress-mobile · 2022-09-08T03:28:14Z

	Messages
📖	This PR has the 'Releases' label: some checks will be skipped.

Generated by 🚫 dangerJS

AliSoftware · 2022-09-08T07:23:23Z

WordPress/Jetpack/Resources/release_notes.txt

@@ -1 +1,3 @@
-* [*] Block Editor: Update link colors in action sheets from green to blue [https://github.com/WordPress/gutenberg/pull/42996]
+Links in action sheets (those pop-up menus on your device that bring up extra options) are now blue instead of green.


Sorry for missing this earlier and before this was sent for editorial, but looking at WordPress/gutenberg#42996 it seems that this change in Gutenberg might only after iOS after all and this shouldn't have been added to the Android release notes?

cc @SiobhyB @dcalhoun ?

Never mind, I though I was reviewing the PR for Android… this is the PR for iOS, so all good 😊

Though this entry in the release notes for Jetpack still feels odd, because it's about Jetpack and yet we're saying we updated colors from green to blue, not the other way around…?!

Or @mokagio did you accidentally swapped the WP and JP release notes when you copied the Editorialized versions in the wrong files?

For posterity, just x-posting the comment here to confirm all looks good with the notes: wordpress-mobile/WordPress-Android#17145 (comment)

…elease_1.82.1 Integrate gutenberg-mobile release 1.82.1

Ratings submitted for the Jetpack app were being submitted to the WordPress app's store listing. This happened because the app was using the incorrect URL to open the App Store app review screen. While the app correctly defined the URL for the Jetpack app, it was then being overwritten at runtime by a URL fetched from an endpoint. This endpoint was only returning a URL for the WordPress app, so it overwrote the Jetpack app's URL with the WordPress app's one. This PR mitigates the problem on the Jetpack app by skipping the endpoint request for the Jetpack app only. This doesn't change behavior on the WordPress app. The impact of this change is that we can no longer remotely disable in-app requests for reviews. However, I don't recall this every being used. The priority here is to restore the Rate Us functionality for the Jetpack app, so follow-up work can look for a more permanenent fix.

…ck-app Fix Jetpack app review URL

AliSoftware

Checked the diff and saw this also includes:

Tooling PR Rename branch_to_build parameter into branch #19281
Beta fix Fix Jetpack app review URL #19299
Gutenberg 1.82.1, following recent hotfix
Editorialized Release Notes in AppStoreStrings.po
Some new .strings already translated (including new App Store metadata for ru)

AliSoftware · 2022-09-09T11:11:13Z

WordPress/Classes/System/WordPressAppDelegate.swift

-        utility.checkIfAppReviewPromptsHaveBeenDisabled(success: nil, failure: {
-            DDLogError("Was unable to retrieve data about throttling")
-        })
+        if AppConfiguration.isWordPress {
+            utility.checkIfAppReviewPromptsHaveBeenDisabled(success: nil, failure: {
+                DDLogError("Was unable to retrieve data about throttling")
+            })
+        }


Comes from https://github.com/wordpress-mobile/WordPress-iOS/pull/19299/files which was merged in release/20.7 after code freeze 👍

AliSoftware · 2022-09-09T11:14:00Z

WordPress/Resources/fr.lproj/Localizable.strings

+/* Add an author prompt for the jetpack prologue */
+"jetpack.prologue.prompt.addAuthor" = "Ajouter un auteur";
+
+/* Build a site prompt for the jetpack prologue */
+"jetpack.prologue.prompt.buildSite" = "Construire un site";
+
+/* Check notifications prompt for the jetpack prologue */
+"jetpack.prologue.prompt.checkNotifications" = "Vérifier vos notifications";
+
+/* Share on Facebook prompt for the jetpack prologue */
+"jetpack.prologue.prompt.fbShare" = "Partager sur Facebook";
+
+/* Fix a security issue prompt for the jetpack prologue */
+"jetpack.prologue.prompt.fixSecurity" = "Résoudre un incident de sécurité";
+
+/* Post a photo prompt for the jetpack prologue */
+"jetpack.prologue.prompt.postPhoto" = "Publier une photo";
+
+/* Read an article prompt for the jetpack prologue */
+"jetpack.prologue.prompt.readArticle" = "Lire un article";
+
+/* Respond to comments prompt for the jetpack prologue */
+"jetpack.prologue.prompt.respondComments" = "Répondre aux commentaires";
+
+/* Restore a backup prompt for the jetpack prologue */
+"jetpack.prologue.prompt.restoreBackup" = "Rétablir une sauvegarde";
+
+/* Search for plugins prompt for the jetpack prologue */
+"jetpack.prologue.prompt.searchPlugins" = "Rechercher des extensions";
+
+/* Search for posts or sites prompt for the jetpack prologue */
+"jetpack.prologue.prompt.searchPosts" = "Rechercher des articles ou sites";
+
+/* Watch your stats prompt for the jetpack prologue */
+"jetpack.prologue.prompt.watchStats" = "Consulter vos statistiques";
+
+/* Write a blog prompt for the jetpack prologue */
+"jetpack.prologue.prompt.writeBlog" = "Tenir un blog";
+


Keys using reverse-DNS notation 💪💪💪

AliSoftware · 2022-09-09T11:14:46Z

fastlane/jetpack_metadata/ru/name.txt

@@ -0,0 +1 @@
+Jetpack — конструктор сайтов


New translation finally fitting length limits? :nice: 👍

mokagio and others added 24 commits September 5, 2022 15:22

Address a RuboCop violation: Remove a redundant () occurrence

4ab12b1

Add default branch value in lanes to trigger release builds

fbd81f3

See conversation at https://github.com/wordpress-mobile/WordPress-iOS/pull/19281/files#r962698176

Leverage default parameter in trigger_..._build usage

0c4b6e8

This makes the code a tiny bit clearer.

Centralize logic to compute release branch name

b49e1b3

Update Gutenberg ref

b8946d6

Update Gutenberg ref

f505242

Bump version number

9be95d8

Merge remote-tracking branch 'origin/release/20.7' into mokagio/align…

aab6779

…-parameters-names-in-buildkite-actions

Update Gutenberg ref

4074f06

Merge pull request #19286 from wordpress-mobile/gutenberg/integrate_r…

a69469e

…elease_1.81.2 Integrate gutenberg-mobile release 1.81.2

Rename branch_to_build parameter into branch (#19281)

b037b8d

Release script: Update gutenberg-mobile ref

f9bed49

Update Gutenberg Mobile reference

bd67004

Fix syntax used to reference Gutenberg Mobile

a6e7641

Update syntax used to reference Gutenberg Mobile

1f6ceec

Apply changes to Podfile

0a4bc36

Merge hotfix 20.6.1 into release 20.7 (#19292)

5f5ca6d

Manually update release_notes.txt with late entry for 20.7

5bc83f3

Update app translations – Localizable.strings

da69066

Update WordPress metadata translations

9c28ff9

Update Jetpack metadata translations

3edf90a

Bump version number

86cb7bb

mokagio self-assigned this Sep 7, 2022

mokagio added the Releases label Sep 7, 2022

mokagio added this to the 20.7 ❄️ milestone Sep 7, 2022

mokagio changed the title ~~Merge changes from beta 20.7.0.1~~ Merge changes from beta 20.7.0.1 and hotfix 20.6.1 Sep 7, 2022

mokagio added 4 commits September 8, 2022 13:23

Add editorialized release notes for Jetpack 20.7

3a1f704

Add editorialized release notes for WordPress 20.7

912f9f7

Update metadata strings

200812a

Update metadata strings

2053338

mokagio changed the title ~~Merge changes from beta 20.7.0.1 and hotfix 20.6.1~~ Merge changes from beta 20.7.0.1, hotfix 20.6.1, and editorialized release notes Sep 8, 2022

mokagio requested a review from a team September 8, 2022 03:29

AliSoftware reviewed Sep 8, 2022

View reviewed changes

Siobhan and others added 10 commits September 8, 2022 11:11

Update to latest Gutenberg Mobile reference

7d2af83

Reference latest Gutenberg Mobile tag

0f46ab1

Merge pull request #19290 from wordpress-mobile/gutenberg/integrate_r…

51126f6

…elease_1.82.1 Integrate gutenberg-mobile release 1.82.1

Reverted unnecessary change

f1b0f42

Merge pull request #19299 from wordpress-mobile/fix/rate-us-for-jetpa…

bb68432

…ck-app Fix Jetpack app review URL

Update app translations – Localizable.strings

04fbb2e

Update WordPress metadata translations

9a4825d

Update Jetpack metadata translations

6347041

Bump version number

ff9ed6f

mokagio enabled auto-merge September 9, 2022 04:08

mokagio changed the title ~~Merge changes from beta 20.7.0.1, hotfix 20.6.1, and editorialized release notes~~ Merge changes from beta 20.7.0.1, hotfix 20.6.1, editorialized release notes, and beta 20.7.0.2 Sep 9, 2022

This was referenced Sep 9, 2022

Integrate gutenberg-mobile release 1.82.1 #19290

Merged

Fix Jetpack app review URL #19299

Merged

mokagio requested review from a team and AliSoftware September 9, 2022 04:19

AliSoftware approved these changes Sep 9, 2022

View reviewed changes

mokagio merged commit 83fa49f into trunk Sep 9, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge changes from beta 20.7.0.1, hotfix 20.6.1, editorialized release notes, and beta 20.7.0.2 #19294

Merge changes from beta 20.7.0.1, hotfix 20.6.1, editorialized release notes, and beta 20.7.0.2 #19294

mokagio commented Sep 7, 2022 •

edited

Loading

wpmobilebot commented Sep 7, 2022 •

edited

Loading

wpmobilebot commented Sep 7, 2022 •

edited

Loading

peril-wordpress-mobile bot commented Sep 8, 2022

AliSoftware Sep 8, 2022 •

edited

Loading

AliSoftware Sep 8, 2022 •

edited

Loading

SiobhyB Sep 8, 2022

AliSoftware left a comment

AliSoftware Sep 9, 2022

AliSoftware Sep 9, 2022

AliSoftware Sep 9, 2022

		@@ -1 +1,3 @@
		* [*] Block Editor: Update link colors in action sheets from green to blue [https://github.com/WordPress/gutenberg/pull/42996]
		Links in action sheets (those pop-up menus on your device that bring up extra options) are now blue instead of green.

		@@ -0,0 +1 @@
		Jetpack — конструктор сайтов

Merge changes from beta 20.7.0.1, hotfix 20.6.1, editorialized release notes, and beta 20.7.0.2 #19294

Merge changes from beta 20.7.0.1, hotfix 20.6.1, editorialized release notes, and beta 20.7.0.2 #19294

Conversation

mokagio commented Sep 7, 2022 • edited Loading

20.7.0.1

20.7.0.2

wpmobilebot commented Sep 7, 2022 • edited Loading

wpmobilebot commented Sep 7, 2022 • edited Loading

peril-wordpress-mobile bot commented Sep 8, 2022

AliSoftware Sep 8, 2022 • edited Loading

Choose a reason for hiding this comment

AliSoftware Sep 8, 2022 • edited Loading

Choose a reason for hiding this comment

SiobhyB Sep 8, 2022

Choose a reason for hiding this comment

AliSoftware left a comment

Choose a reason for hiding this comment

AliSoftware Sep 9, 2022

Choose a reason for hiding this comment

AliSoftware Sep 9, 2022

Choose a reason for hiding this comment

AliSoftware Sep 9, 2022

Choose a reason for hiding this comment

mokagio commented Sep 7, 2022 •

edited

Loading

wpmobilebot commented Sep 7, 2022 •

edited

Loading

wpmobilebot commented Sep 7, 2022 •

edited

Loading

AliSoftware Sep 8, 2022 •

edited

Loading

AliSoftware Sep 8, 2022 •

edited

Loading