diff --git a/combine-prs.yml b/combine-prs.yml index 0e65b80..1ff3ad5 100644 --- a/combine-prs.yml +++ b/combine-prs.yml @@ -106,7 +106,7 @@ jobs: BRANCHES_TO_COMBINE: ${{ steps.fetch-branch-names.outputs.result }} COMBINE_BRANCH_NAME: ${{ github.event.inputs.combineBranchName }} run: | - echo "${{steps.fetch-branch-names.outputs.result}}" + echo "$BRANCHES_TO_COMBINE" sourcebranches="${BRANCHES_TO_COMBINE%\"}" sourcebranches="${sourcebranches#\"}" @@ -124,10 +124,12 @@ jobs: # Creates a PR with the new combined branch - uses: actions/github-script@v3 name: Create Combined Pull Request + env: + PRS_STRING: ${{ steps.fetch-branch-names.outputs.prs-string }} with: github-token: ${{secrets.GITHUB_TOKEN}} script: | - const prString = `${{ steps.fetch-branch-names.outputs.prs-string }}`; + const prString = process.env.PRS_STRING; const body = 'This PR was created by the Combine PRs action by combining the following PRs:\n' + prString; await github.pulls.create({ owner: context.repo.owner,