Skip to content

Replace automerge action with gh CLI in both workflows #38

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
frederickw082922 merged 1 commit into from
Apr 8, 2026
Merged

Replace automerge action with gh CLI in both workflows #38

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
21 changes: 16 additions & 5 deletions .github/workflows/manual-pre-commit-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,22 @@ jobs:
body: 'Auto-approved pre-commit version update. Merging after checks pass.'
})

# Step 6: Automatically merge the PR
# This is the final step, only executed after all checks pass
# Squash all commits into a single commit on merge
# Step 6: Enable auto-merge on the PR so GitHub merges it once all checks pass
- name: Auto-merge PR
if: steps.check_changes.outputs.only_precommit == 'true'
uses: pascalgn/automerge-action@main
env:
GITHUB_TOKEN: ${{ secrets.BOT_PAT }}
GH_TOKEN: ${{ secrets.BOT_PAT }}
run: |
gh --version
echo "PR: ${{ github.event.pull_request.number }}"
echo "Repo: ${{ github.repository }}"
gh pr view "${{ github.event.pull_request.number }}" \
--repo "${{ github.repository }}" \
--json "number,title,state,mergeable,mergeStateStatus" || {
echo "::error::Failed to view PR — check that BOT_PAT has the required scopes"
exit 1
}
gh pr merge "${{ github.event.pull_request.number }}" \
--squash \
--auto \
--repo "${{ github.repository }}"