Skip to content

Support GitHub merge queue in git-merge-pr #5780

@morremeyer

Description

@morremeyer

Checklist

  • I've searched the issue queue to verify this is not a duplicate feature request.
  • I've pasted the output of kargo version, if applicable.
  • I've pasted logs, if applicable.

Proposed Feature

git-merge-pr could support GitHub merge queues. This would enable to use kargo in repositories with merge queue enabled without relying on an external workaround.

Motivation

We use kargo in a repository where we configure image versions for multiple services that are independently deployed, but are parts of the same application.

To prevent service deployments from blocking each other, we use the GitHub merge queue feature. This is currently not available in kargo.

While #5127 added more information to the documentation and the appropriate status, when using git-merge-pr on a repository with merge queue enabled, the error

an unrecoverable error occurred: error running step "step-6": error merging pull request 13: error merging pull request 13: PUT https://api.github.com/repos/org/repo/pulls/pr-number/merge: 405 Merge commits are not allowed on this repository. []

still occurs in kargo 1.9.3.

Metadata

Metadata

Assignees

No one assigned

    Labels

    kind/enhancementAn entirely new featurekind/proposalIndicates maintainers have not yet committed to a feature requestneeds/areaIssue or PR needs to be labeled to indicate what parts of the code base are affectedneeds/priorityPriority has not yet been determined; a good signal that maintainers aren't fully committed

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions