diff --git a/.mergify.yml b/.mergify.yml index 89a7e864e8..25289b3425 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,5 +1,5 @@ pull_request_rules: - - name: automatic merge marked PRs on CI success and review + - name: "strict rebase" conditions: # All Azure builds should be green: - "status-success=digital-asset.daml" @@ -18,3 +18,20 @@ pull_request_rules: strict_method: rebase # Takes no options, see delete_head_branch: {} + - name: "unsafe squash" + conditions: + # All Azure builds should be green: + - "status-success=digital-asset.daml" + # CLA check must pass: + - "status-success=license/cla" + # Special label to request automerge: + - "label=automerge-dangerous-but-faster" + # Note that this only matches people with write / admin access to the repo, + # see + - "#approved-reviews-by>=1" + # Note: mergify cannot break branch protection rules + actions: + merge: + method: squash + # Takes no options, see + delete_head_branch: {}