diff --git a/backport/backport.js b/backport/backport.js index 86b8de5..09f0c10 100644 --- a/backport/backport.js +++ b/backport/backport.js @@ -172,9 +172,9 @@ const getFailedBackportCommentBody = ({ base, commitToBackport, errorMessage, he if (hasBody) { lines = lines.concat([ '# Create the PR body template', - `gh pr view ${originalNumber} --json body --template 'Backport ${commitToBackport} from #${originalNumber}{{ "\\n\\n---\\n\\n" }}{{ index . "body" }}' > .pr-body.txt`, + `PR_BODY=$(gh pr view ${originalNumber} --json body --template 'Backport ${commitToBackport} from #${originalNumber}{{ "\\n\\n---\\n\\n" }}{{ index . "body" }}')`, `# Push the branch to GitHub and a PR`, - `gh pr create --title "${escapedTitle}" --body-file .pr-body.txt ${joinedLabels} --base ${base} --milestone ${backportMilestone} --web`, + `echo "$\{PR_BODY\}" | gh pr create --title "${escapedTitle}" --body-file - ${joinedLabels} --base ${base} --milestone ${backportMilestone} --web`, //eslint-disable-line ]); } else { diff --git a/backport/backport.ts b/backport/backport.ts index 3b713ab..5a6ef61 100644 --- a/backport/backport.ts +++ b/backport/backport.ts @@ -244,9 +244,9 @@ export const getFailedBackportCommentBody = ({ if (hasBody) { lines = lines.concat([ '# Create the PR body template', - `gh pr view ${originalNumber} --json body --template 'Backport ${commitToBackport} from #${originalNumber}{{ "\\n\\n---\\n\\n" }}{{ index . "body" }}' > .pr-body.txt`, + `PR_BODY=$(gh pr view ${originalNumber} --json body --template 'Backport ${commitToBackport} from #${originalNumber}{{ "\\n\\n---\\n\\n" }}{{ index . "body" }}')`, `# Push the branch to GitHub and a PR`, - `gh pr create --title "${escapedTitle}" --body-file .pr-body.txt ${joinedLabels} --base ${base} --milestone ${backportMilestone} --web`, + `echo "$\{PR_BODY\}" | gh pr create --title "${escapedTitle}" --body-file - ${joinedLabels} --base ${base} --milestone ${backportMilestone} --web`, //eslint-disable-line ]) } else { lines = lines.concat([