ci: Use Zed Zippy configuration for creating cherry-pick branch (#53640) (cherry-pick to preview) (#53644)

zed-zippy[bot] and Finn Evers created 23 hours ago

Cherry-pick of #53640 to preview

----
We hope this fixes an issue with permissions

Release Notes:

- N/A

Co-authored-by: Finn Evers <[e-mail]>

Change summary

.github/workflows/cherry_pick.yml                |  6 ++++--
tooling/xtask/src/tasks/workflows/cherry_pick.rs | 12 ++++++++++--
2 files changed, 14 insertions(+), 4 deletions(-)

Detailed changes

.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: [e-mail]
+        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:

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", "[e-mail]"))
+            .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))
     }