From 5f5ed0f487d43127257154e999eefc1f25208368 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Tue, 21 Nov 2023 15:24:55 -0800 Subject: [PATCH] Fix branch name in new cherry pick workflow (#56494) --- .github/workflows/create-cherry-pick-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-cherry-pick-pr.yml b/.github/workflows/create-cherry-pick-pr.yml index dd03a9a4657..1a0a13e327c 100644 --- a/.github/workflows/create-cherry-pick-pr.yml +++ b/.github/workflows/create-cherry-pick-pr.yml @@ -62,7 +62,7 @@ jobs: const title = `🤖 Pick PR #${PR} (${pr.data.title.substring(0, 35)}${pr.data.title.length > 35 ? "..." : ""}) into ${TARGET_BRANCH}`; - await exec.exec("git", ["switch", "--detach", TARGET_BRANCH]); + await exec.exec("git", ["switch", "--detach", `origin/${TARGET_BRANCH}`]); await exec.exec("git", ["switch", "-c", pickBranch]); await exec.exec("git", ["cherry-pick", pr.data.merge_commit_sha]); await exec.exec("git", ["push", "--force", "--set-upstream", "origin", pickBranch]);