Skip to content

Commit

Permalink
CI: Fix dependabot auto-merge to squash (#50)
Browse files Browse the repository at this point in the history
#### Problem

The first job with auto-merge failed because it tried to do a merge
commit, based on the `--merge` flag.

Here's the job failure: https://github.com/solana-program/memo/actions/runs/11970573036/job/33373602205?pr=49

#### Summary of changes

We typically squash merge and disallow merge commits, so use the
`--squash` flag as specified at https://cli.github.com/manual/gh_pr_merge
  • Loading branch information
joncinque authored Nov 22, 2024
1 parent 77e38ec commit 9fd7734
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'solana-program/memo'
steps:
- name: Enable auto-merge
run: gh pr merge --auto --merge "$PR_URL"
run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit 9fd7734

Please sign in to comment.