Skip to content

Commit cb7bd5f

Browse files
authored
Include source PR number in cherry-picks (#42642)
Release Notes: - N/A
1 parent b900ac2 commit cb7bd5f

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.github/workflows/cherry_pick.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Generated from xtask::workflows::cherry_pick
22
# Rebuild with `cargo xtask workflows`.
33
name: cherry_pick
4+
run-name: 'cherry_pick to ${{ inputs.channel }} #${{ inputs.pr_number }}'
45
on:
56
workflow_dispatch:
67
inputs:
@@ -16,6 +17,10 @@ on:
1617
description: channel
1718
required: true
1819
type: string
20+
pr_number:
21+
description: pr_number
22+
required: true
23+
type: string
1924
jobs:
2025
run_cherry_pick:
2126
runs-on: namespace-profile-2x4-ubuntu-2404

tooling/xtask/src/tasks/workflows/cherry_pick.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@ pub fn cherry_pick() -> Workflow {
1010
let branch = Input::string("branch", None);
1111
let commit = Input::string("commit", None);
1212
let channel = Input::string("channel", None);
13+
let pr_number = Input::string("pr_number", None);
1314
let cherry_pick = run_cherry_pick(&branch, &commit, &channel);
1415
named::workflow()
16+
.run_name(format!("cherry_pick to {channel} #{pr_number}"))
1517
.on(Event::default().workflow_dispatch(
1618
WorkflowDispatch::default()
1719
.add_input(commit.name, commit.input())
1820
.add_input(branch.name, branch.input())
19-
.add_input(channel.name, channel.input()),
21+
.add_input(channel.name, channel.input())
22+
.add_input(pr_number.name, pr_number.input()),
2023
))
2124
.add_job(cherry_pick.name, cherry_pick.job)
2225
}

0 commit comments

Comments
 (0)