Skip to content

Commit 9228619

Browse files
💚 Change auto-merge method to MERGE in workflow
Updated the GitHub Actions workflow to use the MERGE method instead of SQUASH when enabling auto-merge for pull requests. Also generalized the step to apply to all PRs, not just Dependabot PRs.
1 parent f995514 commit 9228619

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

.github/workflows/auto-merge.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@ jobs:
2525
echo "is_dependabot=false" >> $GITHUB_OUTPUT
2626
fi
2727
28-
- name: Enable auto-merge for dependabot PRs
29-
if: steps.check_dependabot.outputs.is_dependabot == 'true'
28+
- name: Enable auto-merge for PRs
3029
uses: actions/github-script@v7
3130
with:
3231
script: |
3332
await github.graphql(`
3433
mutation enablePullRequestAutoMerge($pullRequestId: ID!) {
35-
enablePullRequestAutoMerge(input: {pullRequestId: $pullRequestId, mergeMethod: SQUASH}) {
34+
enablePullRequestAutoMerge(input: {pullRequestId: $pullRequestId, mergeMethod: MERGE}) {
3635
pullRequest {
3736
id
3837
autoMergeRequest {

0 commit comments

Comments
 (0)