From 0819d263c86fdde013401bbc3f088ffcb2d4f4f0 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Thu, 12 Dec 2024 16:58:14 +0100
Subject: [PATCH 1/3] Update Gradle Wrapper Validation GitHub Action

---
 .github/workflows/gradle-wrapper-validation.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 405a2b306..19c7c20e5 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/actions/wrapper-validation@v4

From cdb6b71e7d6d77fc3f39ae1d27da0d3328523f0f Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Thu, 12 Dec 2024 16:58:25 +0100
Subject: [PATCH 2/3] Run Buildkite Gradle Wrapper Validation on the Linter
 queue

---
 .buildkite/pipeline.yml      | 3 ++-
 .buildkite/release-build.yml | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index eb613db94..212fa616f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -7,7 +7,8 @@ agents:
 steps:
   - label: ":gradle: Gradle Wrapper Validation"
     command: validate_gradle_wrapper
-    plugins: [$CI_TOOLKIT_PLUGIN]
+    agents:
+      queue: linter
     notify:
       - github_commit_status:
           context: Gradle Wrapper Validation
diff --git a/.buildkite/release-build.yml b/.buildkite/release-build.yml
index 5c8dea2c0..b3e5b1ed5 100644
--- a/.buildkite/release-build.yml
+++ b/.buildkite/release-build.yml
@@ -7,10 +7,13 @@ agents:
   queue: android
 
 steps:
+  # NOTE: once this pipeline is called inline from another pipeline via ReleasesV2,
+  # we may need to use another agent to checkout the release branch before the Gradle Wrapper Validation
   - label: ":gradle: Gradle Wrapper Validation"
     command: validate_gradle_wrapper
     priority: 1
-    plugins: [$CI_TOOLKIT_PLUGIN]
+    agents:
+      queue: linter
 
   - wait
 

From a3a00bd6b1abb68237a6164e6474def159ec7bce Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Fri, 13 Dec 2024 12:36:06 +0100
Subject: [PATCH 3/3] Fix Rubocop violations

---
 tools/extract_release_notes.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/extract_release_notes.rb b/tools/extract_release_notes.rb
index a07119a23..b58b12bb0 100644
--- a/tools/extract_release_notes.rb
+++ b/tools/extract_release_notes.rb
@@ -62,7 +62,7 @@ def replace_pr_link_with_markdown_link(string)
 case mode
 when :strip_pr_links
   formatted_lines = release_lines
-                    .map { |l| l.gsub(/ \[.*\]$/, '') }
+    .map { |l| l.gsub(/ \[.*\]$/, '') }
 when :keep_pr_links
   # The PR "links" are not canonical markdown links. That's not a problem on
   # GitHub where they be automatically parsed into links to the corresponding
@@ -72,7 +72,7 @@ def replace_pr_link_with_markdown_link(string)
   # It's probably best to update the convention in writing the release notes
   # but in the meantime let's compensate with more automation.
   formatted_lines = release_lines
-                    .map { |l| replace_pr_link_with_markdown_link(l) }
+    .map { |l| replace_pr_link_with_markdown_link(l) }
 end
 
 # It would be good to either add overriding of the file where the parsed