Always create a merge commit if a PR is approved for merge and tag

channable / hoff

A gatekeeper for your commits

Apache License 2.0

41 stars 3 forks source link

Always create a merge commit if a PR is approved for merge and tag #242

Closed maartenberg closed 1 year ago

maartenberg commented 1 year ago

This PR alters Hoff's merge logic to always create a merge commit if a tag is to be created after merging. This fixes an issue where our deploy automation breaks if a single-commit PR is merge and tagged, because the required approver information is recorded in the merge commit's message.

maartenberg commented 1 year ago

@OpsBotPrime merge

OpsBotPrime commented 1 year ago

Pull request approved for merge by @maartenberg, rebasing now.

OpsBotPrime commented 1 year ago

Rebased as 6c005f13ac6ecb0a888d1c1de19a034525855064, waiting for CI …

OpsBotPrime commented 1 year ago

CI job :yellow_circle: started.