Skip to content

ci: Finally fix auto-merge for gitflow #7924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 20, 2023
Merged

ci: Finally fix auto-merge for gitflow #7924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/gitflow-sync-develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ jobs:
github_token: ${{ secrets.REPO_SCOPED_TOKEN }}

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

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