Skip to content

Commit b5ed7b9

Browse files
Auto-Merge Automatic PR (#4343)
* Make Automatic issues auto-close * Change PAT
1 parent ab97601 commit b5ed7b9

File tree

4 files changed

+36
-3
lines changed

4 files changed

+36
-3
lines changed

.github/workflows/auto-update-app-headers.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,16 @@ jobs:
9090
if [ -n "$PR_NUMBER" ]; then
9191
gh pr review $PR_NUMBER --approve
9292
fi
93-
94-
- name: Re-approve pull request after update
93+
94+
- name: Approve pull request and merge
9595
if: env.changed == 'true'
9696
env:
97-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
97+
GH_TOKEN: ${{ secrets.PAT_AUTOMERGE }}
9898
run: |
9999
PR_NUMBER=$(gh pr list --head "pr-update-app-files" --json number --jq '.[].number')
100100
if [ -n "$PR_NUMBER" ]; then
101101
gh pr review $PR_NUMBER --approve
102+
gh pr merge $PR_NUMBER --squash --admin
102103
fi
103104
104105
# Step 8: Output success message when no changes

.github/workflows/changelog-pr.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,17 @@ jobs:
264264
gh pr review $PR_NUMBER --approve
265265
fi
266266
267+
- name: Approve pull request and merge
268+
if: env.changed == 'true'
269+
env:
270+
GH_TOKEN: ${{ secrets.PAT_AUTOMERGE }}
271+
run: |
272+
PR_NUMBER=$(gh pr list --head "${BRANCH_NAME}" --json number --jq '.[].number')
273+
if [ -n "$PR_NUMBER" ]; then
274+
gh pr review $PR_NUMBER --approve
275+
gh pr merge $PR_NUMBER --squash --admin
276+
fi
277+
267278
- name: Re-approve pull request after update
268279
if: env.changed == 'true'
269280
env:

.github/workflows/crawl-versions.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,17 @@ jobs:
104104
gh pr review $PR_NUMBER --approve
105105
fi
106106
107+
- name: Approve pull request and merge
108+
if: env.changed == 'true'
109+
env:
110+
GH_TOKEN: ${{ secrets.PAT_AUTOMERGE }}
111+
run: |
112+
PR_NUMBER=$(gh pr list --head "update_versions" --json number --jq '.[].number')
113+
if [ -n "$PR_NUMBER" ]; then
114+
gh pr review $PR_NUMBER --approve
115+
gh pr merge $PR_NUMBER --squash --admin
116+
fi
117+
107118
- name: Re-approve pull request after update
108119
if: env.changed == 'true'
109120
env:

.github/workflows/update-json-date.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,16 @@ jobs:
126126
if [ -n "$PR_NUMBER" ]; then
127127
gh pr review $PR_NUMBER --approve
128128
fi
129+
- name: Approve pull request and merge
130+
if: env.changed == 'true'
131+
env:
132+
GH_TOKEN: ${{ secrets.PAT_AUTOMERGE }}
133+
run: |
134+
PR_NUMBER=$(gh pr list --head "${{ env.BRANCH_NAME }}" --json number --jq '.[].number')
135+
if [ -n "$PR_NUMBER" ]; then
136+
gh pr review $PR_NUMBER --approve
137+
gh pr merge $PR_NUMBER --squash --admin
138+
fi
129139
130140
- name: No changes detected
131141
if: env.changed == 'false'

0 commit comments

Comments
 (0)