Merge branch 'trunk' into issue/self-hosted-users-feature-flag

.buildkite/beta-builds.yml

@@ -52,6 +52,10 @@ steps:
         plugins: [$CI_TOOLKIT]
         notify:
           - slack: "#build-and-ship"
+        retry:
+          manual:
+            # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
+            allowed: false
 
       - label: ":jetpack: :android: Beta Build"
         key: jpbuild
@@ -60,6 +64,10 @@ steps:
         plugins: [$CI_TOOLKIT]
         notify:
           - slack: "#build-and-ship"
+        retry:
+          manual:
+            # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
+            allowed: false
 
   #################
   # GitHub Release

.buildkite/code-freeze.yml

@@ -1,7 +1,6 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 ---
 
-
 steps:
   - label: "Code Freeze"
     plugins: [$CI_TOOLKIT]
@@ -16,3 +15,7 @@ steps:
       bundle exec fastlane code_freeze skip_confirm:true
     agents:
        queue: "tumblr-metal"
+    retry:
+      manual:
+        # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
+        allowed: false

.buildkite/commands/checkout-release-branch.sh

@@ -1,7 +1,6 @@
 #!/bin/bash -eu
 
-# RELEASE_VERSION is passed as an environment variable from fastlane to Buildkite
-#
+# RELEASE_VERSION is passed as an environment variable passed to Buildkite by ReleasesV2.
 if [[ -z "${RELEASE_VERSION}" ]]; then
     echo "RELEASE_VERSION is not set."
     exit 1

.buildkite/complete-code-freeze.yml

@@ -1,7 +1,6 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 ---
 
-
 steps:
   - label: "Complete Code Freeze"
     plugins: [$CI_TOOLKIT]
@@ -19,3 +18,7 @@ steps:
       bundle exec fastlane complete_code_freeze skip_confirm:true
     agents:
        queue: "tumblr-metal"
+    retry:
+      manual:
+        # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
+        allowed: false

.buildkite/finalize-release.yml

@@ -1,7 +1,6 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 ---
 
-
 steps:
   - label: "Finalize release"
     plugins: [$CI_TOOLKIT]
@@ -21,3 +20,7 @@ steps:
       bundle exec fastlane finalize_release skip_confirm:true
     agents:
        queue: "tumblr-metal"
+    retry:
+      manual:
+        # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
+        allowed: false

.buildkite/new-beta-release.yml

@@ -1,7 +1,6 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 ---
 
-
 steps:
   - label: "New Beta Release"
     plugins: [$CI_TOOLKIT]
@@ -18,3 +17,7 @@ steps:
       bundle exec fastlane new_beta_release skip_confirm:true
     agents:
        queue: "tumblr-metal"
+    retry:
+      manual:
+        # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
+        allowed: false

.buildkite/publish-release.yml

@@ -0,0 +1,24 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
+steps:
+  - label: Publish Release
+    plugins: [$CI_TOOLKIT]
+    command: |
+      echo '--- :robot_face: Use bot for git operations'
+      source use-bot-for-git
+
+      echo '--- :git: Checkout Release Branch'
+      .buildkite/commands/checkout-release-branch.sh
+
+      echo '--- :ruby: Setup Ruby tools'
+      install_gems
+
+      echo '--- :package: Publish Release'
+      bundle exec fastlane publish_release skip_confirm:true
+    agents:
+       queue: tumblr-metal
+    retry:
+      manual:
+        # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
+        allowed: false

.buildkite/release-builds.yml

@@ -56,6 +56,10 @@ steps:
         plugins: [$CI_TOOLKIT]
         notify:
           - slack: "#build-and-ship"
+        retry:
+          manual:
+            # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
+            allowed: false
 
       - label: ":jetpack: :android: Release Build"
         key: jpbuild
@@ -65,6 +69,10 @@ steps:
         plugins: [$CI_TOOLKIT]
         notify:
           - slack: "#build-and-ship"
+        retry:
+          manual:
+            # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
+            allowed: false
 
   #################
   # GitHub Release

.buildkite/update-release-notes.yml

@@ -19,3 +19,7 @@ steps:
       bundle exec fastlane update_appstore_strings version:${RELEASE_VERSION}
     agents:
        queue: "tumblr-metal"
+    retry:
+      manual:
+        # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
+        allowed: false

Gemfile

@@ -9,7 +9,7 @@ gem 'nokogiri'
 ### Fastlane Plugins
 
 gem 'fastlane-plugin-sentry'
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 12.0'
 # gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../release-toolkit'
 # gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', branch: ''
 

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.2.0)
+    activesupport (7.2.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -22,17 +22,17 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.963.0)
-    aws-sdk-core (3.201.4)
+    aws-partitions (1.974.0)
+    aws-sdk-core (3.205.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-kms (1.91.0)
+      aws-sdk-core (~> 3, >= 3.205.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.157.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-s3 (1.162.0)
+      aws-sdk-core (~> 3, >= 3.205.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.9.1)
@@ -161,7 +161,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-sentry (1.24.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (11.1.0)
+    fastlane-plugin-wpmreleasetoolkit (12.1.0)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -170,7 +170,7 @@ GEM
       git (~> 1.3)
       google-cloud-storage (~> 1.31)
       java-properties (~> 0.3.0)
-      nokogiri (~> 1.11, < 1.17)
+      nokogiri (~> 1.11)
       octokit (~> 6.1)
       parallel (~> 1.14)
       plist (~> 3.1)
@@ -219,7 +219,7 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.6)
+    http-cookie (1.0.7)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (1.14.5)
@@ -234,11 +234,11 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    logger (1.6.0)
+    logger (1.6.1)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.24.1)
+    minitest (5.25.1)
     multi_json (1.15.0)
     multipart-post (2.4.1)
     nanaimo (0.3.0)
@@ -255,7 +255,7 @@ GEM
     options (2.3.2)
     optparse (0.5.0)
     os (1.1.4)
-    parallel (1.26.2)
+    parallel (1.26.3)
     parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
@@ -276,8 +276,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.7)
     rmagick (4.3.0)
     rouge (2.0.7)
     rubocop (1.65.1)
@@ -309,7 +308,6 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -342,7 +340,7 @@ DEPENDENCIES
   danger-dangermattic (~> 1.0)
   fastlane (~> 2)
   fastlane-plugin-sentry
-  fastlane-plugin-wpmreleasetoolkit (~> 11.0)
+  fastlane-plugin-wpmreleasetoolkit (~> 12.0)
   nokogiri
   rmagick (~> 4.1)
 

fastlane/Fastfile

@@ -156,7 +156,6 @@ end
 ########################################################################
 # Import domain-specific lanes
 ########################################################################
-import 'helpers/github.rb'
 import 'lanes/build.rb'
 import 'lanes/localization.rb'
 import 'lanes/release.rb'

fastlane/lanes/localization.rb

@@ -134,8 +134,7 @@
 
     push_to_git_remote(tags: false)
 
-    release_branch = "release/#{version}"
-    create_release_management_pull_request(release_branch, "Merge #{version} editorialized release notes to #{release_branch}")
+    create_backmerge_pr
   end
 
   # Updates the metadata in the Play Store (Main store listing) from the content of `fastlane/{metadata|jetpack_metadata}/android/*/*.txt` files