Skip to content

Commit 1d5430e

Browse files
authored
ci: Finally fix auto-merge for gitflow (#7924)
1 parent 856953b commit 1d5430e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/gitflow-sync-develop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ jobs:
3939
github_token: ${{ secrets.REPO_SCOPED_TOKEN }}
4040

4141
- name: Enable automerge for PR
42-
run: gh pr merge --merge --auto "1"
42+
if: steps.open-pr.outputs.pr_number != ''
43+
run: gh pr merge --merge --auto "${{ steps.open-pr.outputs.pr_number }}"
4344
env:
4445
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4546

4647
# https://github.com/marketplace/actions/auto-approve
4748
- name: Auto approve PR
48-
# Always skip this for now, until we got a proper bot setup
4949
if: steps.open-pr.outputs.pr_number != ''
5050
uses: hmarr/auto-approve-action@v3
5151
with:

0 commit comments

Comments
 (0)