From cb7bd5fe19097003190542deeff7208f166ddfc9 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 13 Nov 2025 09:06:26 -0700
Subject: [PATCH] Include source PR number in cherry-picks (#42642)

Release Notes:

- N/A
---
 .github/workflows/cherry_pick.yml                | 5 +++++
 tooling/xtask/src/tasks/workflows/cherry_pick.rs | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cherry_pick.yml b/.github/workflows/cherry_pick.yml
index 69a46558396bd04db9f43e5d401c74d14b07fc88..bc01aae17e7141a2359b162c3de94c1aec7b765c 100644
--- a/.github/workflows/cherry_pick.yml
+++ b/.github/workflows/cherry_pick.yml
@@ -1,6 +1,7 @@
 # Generated from xtask::workflows::cherry_pick
 # Rebuild with `cargo xtask workflows`.
 name: cherry_pick
+run-name: 'cherry_pick to ${{ inputs.channel }} #${{ inputs.pr_number }}'
 on:
   workflow_dispatch:
     inputs:
@@ -16,6 +17,10 @@ on:
         description: channel
         required: true
         type: string
+      pr_number:
+        description: pr_number
+        required: true
+        type: string
 jobs:
   run_cherry_pick:
     runs-on: namespace-profile-2x4-ubuntu-2404
diff --git a/tooling/xtask/src/tasks/workflows/cherry_pick.rs b/tooling/xtask/src/tasks/workflows/cherry_pick.rs
index 1a8407f2ec403648946dc091d3d1763b982d8452..6181d79e042365b87ce2d6ad00a75580c71344a2 100644
--- a/tooling/xtask/src/tasks/workflows/cherry_pick.rs
+++ b/tooling/xtask/src/tasks/workflows/cherry_pick.rs
@@ -10,13 +10,16 @@ pub fn cherry_pick() -> Workflow {
     let branch = Input::string("branch", None);
     let commit = Input::string("commit", None);
     let channel = Input::string("channel", None);
+    let pr_number = Input::string("pr_number", None);
     let cherry_pick = run_cherry_pick(&branch, &commit, &channel);
     named::workflow()
+        .run_name(format!("cherry_pick to {channel} #{pr_number}"))
         .on(Event::default().workflow_dispatch(
             WorkflowDispatch::default()
                 .add_input(commit.name, commit.input())
                 .add_input(branch.name, branch.input())
-                .add_input(channel.name, channel.input()),
+                .add_input(channel.name, channel.input())
+                .add_input(pr_number.name, pr_number.input()),
         ))
         .add_job(cherry_pick.name, cherry_pick.job)
 }