Skip to content

Commit

Permalink
Fix merge release workflow (#261)
Browse files Browse the repository at this point in the history
* fix: add --body back to gh pr create

also remove if conditional since this is not a bash script

* fix: update create PR for new lines
  • Loading branch information
diogomatsubara authored Jan 17, 2025
1 parent 611b9a6 commit c0dcf9e
Showing 1 changed file with 12 additions and 13 deletions.
25 changes: 12 additions & 13 deletions .github/workflows/merge-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,18 @@ jobs:
steps:
- name: Create PR
id: cpr
run: >
pr_url=$(gh pr create
--title "chore: Merge release/${{ inputs.version }} into main"
"- Merge release/${{ inputs.version }} into main\n- Open new development line"
--head release/${{ inputs.version }}
--base main
--label internal
-R ${{ inputs.repo }})
if [[ $? == 0 ]];
echo "pull-request-operation=created" >> $GITHUB_OUTPUT
pr_number="${pr_url##*/pull/}"
echo "pull-request-number=$pr_number" >> $GITHUB_OUTPUT
fi
run: |
pr_url=$(gh pr create \
--title "chore: Merge release/${{ inputs.version }} into main" \
--body "Open new development line" \
--head release/${{ inputs.version }} \
--base main \
--label internal \
-R ${{ inputs.repo }} \
)
echo "pull-request-operation=created" >> $GITHUB_OUTPUT
pr_number="${pr_url##*/pull/}"
echo "pull-request-number=$pr_number" >> $GITHUB_OUTPUT
env:
GH_TOKEN: ${{ secrets.BOT_TOKEN_WORKFLOW }}

Expand Down

0 comments on commit c0dcf9e

Please sign in to comment.