Fix cherry-pick job for unmerged PRs (#56510)

This commit is contained in:
Jake Bailey 2023-11-22 10:53:52 -08:00 committed by GitHub
parent dcbfb0c75e
commit 8caae9394d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -66,7 +66,7 @@ jobs:
await exec.exec("git", ["config", "user.name", "TypeScript Bot"]);
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", ["cherry-pick", "-m", "-1", pr.data.merge_commit_sha]);
await exec.exec("git", ["push", "--force", "--set-upstream", "origin", pickBranch]);
const existingPulls = await github.rest.pulls.list({