Skip to content

Commit 2e131b9

Browse files
committed
[no-relnote] Update cherrypick action
See NVIDIA/k8s-device-plugin#1529 Signed-off-by: Evan Lezar <[email protected]>
1 parent 05c2d13 commit 2e131b9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/scripts/backport.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ for (const targetBranch of branches) {
7070
const commitMessage = commit.commit.message.split('\n')[0];
7171
core.info(`Cherry-picking commit ${i + 1}/${commits.length}: ${commitSha.substring(0, 7)} - ${commitMessage}`);
7272
try {
73-
execSync(`git cherry-pick -x ${commitSha}`, {
73+
execSync(`git cherry-pick -m 1 -x ${commitSha}`, {
7474
encoding: 'utf-8',
7575
stdio: 'pipe'
7676
});

.github/workflows/cherrypick.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ jobs:
4444

4545
- name: Configure git
4646
run: |
47-
git config user.name "nvidia-backport-bot"
48-
git config user.email "noreply@nvidia.com"
47+
git config user.name "github-actions[bot]"
48+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
4949
5050
- name: Add labels and handle backport
5151
uses: actions/github-script@v8
@@ -65,7 +65,7 @@ jobs:
6565
6666
steps:
6767
- name: Checkout base branch repository
68-
uses: actions/checkout@v4
68+
uses: actions/checkout@v5
6969
with:
7070
fetch-depth: 0
7171
ref: ${{ github.event.pull_request.base.ref }}

0 commit comments

Comments
 (0)