Skip to content

Commit e113fcd

Browse files
committed
First enable automerge and then auto approve PR
1 parent 8d43015 commit e113fcd

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/Verify.Redist.Update.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ jobs:
4949
;;
5050
esac
5151
52-
- name: Auto-approve PR
53-
if: success() && env.ALLOW_AUTO_MERGE_REDIST_PR != 'true' && github.actor == 'rocketmodfixadmin'
54-
uses: hmarr/auto-approve-action@v4
55-
with:
56-
github-token: ${{ secrets.GITHUB_TOKEN }}
57-
58-
- name: Auto-merge PR
52+
- name: Enable PR automerge
5953
if: success() && env.ALLOW_AUTO_MERGE_REDIST_PR == 'true' && github.actor == 'rocketmodfixadmin'
6054
uses: peter-evans/enable-pull-request-automerge@v3
6155
with:
6256
token: ${{ secrets.PAT }}
6357
pull-request-number: ${{ github.event.pull_request.number }}
6458
merge-method: squash
59+
60+
- name: Auto-approve PR
61+
if: success() && env.ALLOW_AUTO_MERGE_REDIST_PR != 'true' && github.actor == 'rocketmodfixadmin'
62+
uses: hmarr/auto-approve-action@v4
63+
with:
64+
github-token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)