From 7f73e38452353b3ac2a9b6e52ba7ca517e6a5d97 Mon Sep 17 00:00:00 2001 From: Finn Evers Date: Fri, 10 Apr 2026 19:14:06 +0200 Subject: [PATCH] ci: Use Zed Zippy configuration for creating cherry-pick branch (#53640) We hope this fixes an issue with permissions Release Notes: - N/A --- .github/workflows/cherry_pick.yml | 6 ++++-- tooling/xtask/src/tasks/workflows/cherry_pick.rs | 12 ++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cherry_pick.yml b/.github/workflows/cherry_pick.yml index ed0800dc5bbf1ec59182e9d24753e9b5112c4d13..b24f8a133be8f3c2be0191f57d8d587d53ea21d0 100644 --- a/.github/workflows/cherry_pick.yml +++ b/.github/workflows/cherry_pick.yml @@ -44,8 +44,10 @@ jobs: BRANCH: ${{ inputs.branch }} COMMIT: ${{ inputs.commit }} CHANNEL: ${{ inputs.channel }} - GIT_COMMITTER_NAME: Zed Zippy - GIT_COMMITTER_EMAIL: hi@zed.dev + GIT_AUTHOR_NAME: zed-zippy[bot] + GIT_AUTHOR_EMAIL: <234243425+zed-zippy[bot]@users.noreply.github.com> + GIT_COMMITTER_NAME: zed-zippy[bot] + GIT_COMMITTER_EMAIL: <234243425+zed-zippy[bot]@users.noreply.github.com> GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }} defaults: run: diff --git a/tooling/xtask/src/tasks/workflows/cherry_pick.rs b/tooling/xtask/src/tasks/workflows/cherry_pick.rs index 46fb41094eb9fcea3cf40c4a289217f16855483b..fe5a966156d16ba0598e0af3671a504d70d61df7 100644 --- a/tooling/xtask/src/tasks/workflows/cherry_pick.rs +++ b/tooling/xtask/src/tasks/workflows/cherry_pick.rs @@ -39,8 +39,16 @@ fn run_cherry_pick( .add_env(("BRANCH", branch.to_string())) .add_env(("COMMIT", commit.to_string())) .add_env(("CHANNEL", channel.to_string())) - .add_env(("GIT_COMMITTER_NAME", "Zed Zippy")) - .add_env(("GIT_COMMITTER_EMAIL", "hi@zed.dev")) + .add_env(("GIT_AUTHOR_NAME", "zed-zippy[bot]")) + .add_env(( + "GIT_AUTHOR_EMAIL", + "<234243425+zed-zippy[bot]@users.noreply.github.com>", + )) + .add_env(("GIT_COMMITTER_NAME", "zed-zippy[bot]")) + .add_env(( + "GIT_COMMITTER_EMAIL", + "<234243425+zed-zippy[bot]@users.noreply.github.com>", + )) .add_env(("GITHUB_TOKEN", token)) }