Merge release/24.8 with editorialized release notes (#23140)

wordpress-mobile · May 2, 2024 · 9fa967f · 9fa967f
2 parents e2b37e3 + 9bf755b
commit 9fa967f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/WordPress/Jetpack/Resources/AppStoreStrings.po b/WordPress/Jetpack/Resources/AppStoreStrings.po
@@ -81,10 +81,9 @@ msgctxt "app_store_keywords"
 msgid "social,notes,jetpack,writing,geotagging,media,blog,website,blogging,journal"
 msgstr ""
 
-msgctxt "v24.7-whats-new"
+msgctxt "v24.8-whats-new"
 msgid ""
-"We’ve added reading preferences so you can customize your Reader screen. Pick the color, font, and size you like the most for a reading experience that fits your vibe.\n"
-"We also updated the Insights tab to load and scroll better. No flickering, no breaking, no problem.\n"
+"We made some updates to the Pages menu. You’ll now find Settings in its own section, right underneath Stats (which we also moved). It’s available for both published and unpublished posts. Groovy.\n"
 msgstr ""
 
 #. translators: This is a promo message that will be attached on top of the first screenshot in the App Store.

diff --git a/WordPress/Jetpack/Resources/release_notes.txt b/WordPress/Jetpack/Resources/release_notes.txt
@@ -1,4 +1 @@
-* [*] [internal] Update Reachability. [#23030]
-* [*] Move "Settings" context menu action in "Pages" from the submenu to a separate section to make it easily discoverable and make it available for unpublished posts [#23065]
-* [*] Add "Stats" context menu action to "Pages" [#23065]
-
+We made some updates to the Pages menu. You’ll now find Settings in its own section, right underneath Stats (which we also moved). It’s available for both published and unpublished posts. Groovy.
diff --git a/WordPress/Resources/AppStoreStrings.po b/WordPress/Resources/AppStoreStrings.po
@@ -45,12 +45,9 @@ msgctxt "app_store_keywords"
 msgid "blogger,writing,blogging,web,maker,online,store,business,make,create,write,blogs"
 msgstr ""
 
-msgctxt "v24.7-whats-new"
+msgctxt "v24.8-whats-new"
 msgid ""
-"Release notes loading…\n"
-"Release notes loading…\n"
-"Release notes loading…\n"
-"(Just kidding, no new updates. See you in two weeks!)\n"
+"We made some updates to the Pages menu. You’ll now find Settings in its own section, and it’s available for both published and unpublished posts. Groovy.\n"
 msgstr ""
 
 #. translators: This is a standard chunk of text used to tell a user what's new with a release when nothing major has changed.

diff --git a/WordPress/Resources/release_notes.txt b/WordPress/Resources/release_notes.txt
@@ -1,3 +1 @@
-* [*] [internal] Update Reachability. [#23030]
-* [*] Move "Settings" context menu action in "Pages" from the submenu to a separate section to make it easily discoverable and make it available for unpublished posts [#23065]
-
+We made some updates to the Pages menu. You’ll now find Settings in its own section, and it’s available for both published and unpublished posts. Groovy.
diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
@@ -434,8 +434,12 @@ def upload_build_to_testflight(whats_new_path:, distribution_groups:)
       changelog: File.read(whats_new_path),
       distribute_external: true,
       groups: distribution_groups,
-      # If there is a build waiting for beta review, we want to reject that so the new build can be submitted instead
-      reject_build_waiting_for_review: true
+      # If there is a build waiting for beta review, we ~~want~~ would like to to reject that so the new build can be submitted instead.
+      # Unfortunately, this is not (no longer?) possible via the ASC API.
+      # See https://github.com/fastlane/fastlane/issues/18408
+      #
+      # As a quick workaround to avoid CI failures, let's explicitly disable rejecting builds waiting for review.
+      reject_build_waiting_for_review: false
     )
   end