643dfc8c05
Squash merges caused orphaned commits when pushing after auto-merge. Regular merges preserve full commit history and avoid this issue. - Disabled squash and rebase merge on repo settings - Updated automerge action: MERGE_METHOD squash → merge - Updated CLAUDE.md workflow docs Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
29 lines
705 B
YAML
29 lines
705 B
YAML
name: Automerge
|
|
|
|
on:
|
|
check_suite:
|
|
types: [completed]
|
|
pull_request:
|
|
types: [labeled]
|
|
|
|
jobs:
|
|
automerge:
|
|
name: Automerge PR
|
|
runs-on: ubuntu-latest
|
|
if: >
|
|
github.event_name == 'pull_request' ||
|
|
(github.event_name == 'check_suite' && github.event.check_suite.conclusion == 'success')
|
|
permissions:
|
|
contents: write
|
|
pull-requests: write
|
|
steps:
|
|
- uses: actions/checkout@v6
|
|
|
|
- name: Automerge
|
|
uses: pascalgn/automerge-action@v0.16.4
|
|
env:
|
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
MERGE_LABELS: "automerge"
|
|
MERGE_METHOD: "merge"
|
|
MERGE_DELETE_BRANCH: "true"
|
|
UPDATE_METHOD: "rebase"
|