From 8188901dc10e9ef83f76ac133fe4a2058b9a6d6c Mon Sep 17 00:00:00 2001 From: Gary Verhaegen Date: Thu, 9 May 2019 16:02:21 +0100 Subject: [PATCH] add non-strict mergify option (#1049) Add the option of setting the `automerge-dangerous-but-fast` label on a PR to request mergify to merge it ASAP, i.e. as soon as tests pass, skipping the important "rebase" step, making it prone to "race condition" issues getting introduced and breaking master. This should only be used for either very safe or very urgent work. Please keep in mind `master` is the stable, shared branch from which everyone works and its primary goal is to be stable. It is not the only way to share code and should not be the primary way to share code within small groups of people working on the same thing together. --- .mergify.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 89a7e864e8e..25289b34257 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: {}