From 1d19aa0dd51b776f916060f67570ada76cfcb366 Mon Sep 17 00:00:00 2001 From: ammallya Date: Mon, 18 Aug 2025 12:17:31 -0700 Subject: [PATCH] Escaping /r --- .github/workflows/import_pr_list.yml | 33 ++++++++++++---------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/.github/workflows/import_pr_list.yml b/.github/workflows/import_pr_list.yml index 7e376ef8cf..85ffb4a34d 100644 --- a/.github/workflows/import_pr_list.yml +++ b/.github/workflows/import_pr_list.yml @@ -85,25 +85,20 @@ jobs: env: GH_TOKEN: ${{ steps.generate-token.outputs.token }} run: | - PR_JSON=$(gh pr view ${{ matrix.pr_number }} \ - --repo ${{ github.event.inputs.subrepo-upstream }} \ - --json title,body,headRefName,headRepository,isDraft \ - --jq '{title: .title, body: .body, head_ref: .headRefName, head_repo: .headRepository.cloneUrl, is_draft: .isDraft}') - - echo "$PR_JSON" > pr.json - - TITLE=$(jq -r .title pr.json | sed 's/`/\\`/g') - echo "title=$TITLE" >> $GITHUB_OUTPUT - - { - echo 'body<> $GITHUB_OUTPUT - - echo "head_ref=$(jq -r .head_ref pr.json)" >> $GITHUB_OUTPUT - echo "head_repo=$(jq -r .head_repo pr.json)" >> $GITHUB_OUTPUT - echo "is_draft=$(jq -r .is_draft pr.json)" >> $GITHUB_OUTPUT + PR_JSON=$(gh pr view ${{ matrix.pr_number }} \ + --repo ${{ github.event.inputs.subrepo-upstream }} \ + --json title,body,headRefName,headRepository,isDraft \ + --jq '{title: .title, body: .body, head_ref: .headRefName, head_repo: .headRepository.cloneUrl, is_draft: .isDraft}') + echo "$PR_JSON" > pr.json + TITLE=$(jq -r .title pr.json | sed 's/`/\\`/g' | sed 's/\r$//g') + echo "title=$TITLE" >> $GITHUB_OUTPUT + BODY_CLEAN=$(jq -r .body pr.json | sed 's/\r//g') + echo "body<> $GITHUB_OUTPUT + echo "$BODY_CLEAN" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT + echo "head_ref=$(jq -r .head_ref pr.json)" >> $GITHUB_OUTPUT + echo "head_repo=$(jq -r .head_repo pr.json)" >> $GITHUB_OUTPUT + echo "is_draft=$(jq -r .is_draft pr.json)" >> $GITHUB_OUTPUT - name: Create new branch for import id: import-branch