Skip to content

ci: handle #148 by skipping auto-merge on workflow changes (workaround for App workflows:write) #152

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
patchloom-release merged 2 commits into from
Jun 22, 2026
Merged

ci: handle #148 by skipping auto-merge on workflow changes (workaround for App workflows:write) #152

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc7ba7b
ci: skip auto-merge for PRs touching .github/workflows/ to avoid need…
SebTardif Jun 22, 2026
4475d34
Merge branch 'main' into fix/handle-issues-147-149-plus-148
SebTardif Jun 22, 2026
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
15 changes: 14 additions & 1 deletion .github/workflows/auto-approve.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,21 @@ jobs:
client-id: ${{ vars.APP_CLIENT_ID }}
private-key: ${{ secrets.APP_PRIVATE_KEY }}

- name: Check for workflow file changes (to avoid App token needing workflows:write)
id: wf-changes
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
pr="${{ github.event.pull_request.number }}"
if gh pr view "$pr" --json files --jq '.files[].path' | grep -q '^\.github/workflows/'; then
echo "changes=true" >> "$GITHUB_OUTPUT"
echo "PR touches .github/workflows/; will skip auto-merge (App lacks workflows:write)"
else
echo "changes=false" >> "$GITHUB_OUTPUT"
fi

- name: Enable auto-merge
if: github.event.pull_request.user.login != 'patchloom-release[bot]'
if: github.event.pull_request.user.login != 'patchloom-release[bot]' && steps.wf-changes.outputs.changes != 'true'
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: gh pr merge --auto --squash "${{ github.event.pull_request.number }}" --repo "${{ github.repository }}"