Skip to content

pass --squash to gh pr merge in dependabot auto-merge - #191

Merged
gauron99 merged 1 commit into
functions-dev:mainfrom
gauron99:push-slpsnxsvlktx
Aug 4, 2026
Merged

pass --squash to gh pr merge in dependabot auto-merge#191
gauron99 merged 1 commit into
functions-dev:mainfrom
gauron99:push-slpsnxsvlktx

Conversation

@gauron99

@gauron99 gauron99 commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

main had a merge queue until 2026-07-30 14:09 (the last merge_group workflow run). gh pr merge skips the merge-strategy requirement only when the base branch requires a merge queue (shouldAddToMergeQueue in pkg/cmd/pr/merge/merge.go); otherwise a non-interactive call without --merge/--rebase/--squash is a flag error.

Once the queue was disabled the step started failing at 14:20, 11 minutes later, with:

--merge, --rebase, or --squash required when not running interactively

The job failed on every dependabot PR from then on, so auto-merge was never enabled and bump PRs piled up (177, 185, 188, 189, 190 still open with tests green).

The repo allows squash only, so --squash is the only valid method. If a merge queue is ever re-enabled, gh just warns that the queue sets the strategy, so this is safe either way.

main had a merge queue until 2026-07-30 14:09 (last merge_group run).
gh pr merge skips the merge-strategy requirement only when the base branch
requires a merge queue (shouldAddToMergeQueue in pkg/cmd/pr/merge/merge.go);
otherwise a non-interactive call without --merge/--rebase/--squash is a
flag error. Once the queue was disabled the step started failing at 14:20,
so auto-merge was never enabled and bump PRs piled up.

The repo allows squash only. If a merge queue is ever re-enabled, gh just
warns that the queue sets the strategy, so this is safe either way.
@gauron99
gauron99 requested a review from maschmid August 4, 2026 11:19
@gauron99 gauron99 changed the title fix(ci): pass --squash to gh pr merge in dependabot auto-merge pass --squash to gh pr merge in dependabot auto-merge Aug 4, 2026
@gauron99
gauron99 force-pushed the push-slpsnxsvlktx branch from 0736dce to e8c6bc2 Compare August 4, 2026 11:23
@gauron99
gauron99 enabled auto-merge (squash) August 4, 2026 11:59
@gauron99
gauron99 merged commit 2ce230e into functions-dev:main Aug 4, 2026
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant