From 5c7de756611e3692d364f166e42ab5490cd65362 Mon Sep 17 00:00:00 2001 From: adbridge Date: Mon, 23 Mar 2020 13:51:19 +0000 Subject: [PATCH 1/5] Fix incomplete mergify rules 1. If a PR is closed but not merged then remove all labels 2. If a release version is added and there are release version missing or Release review required, then remove those labels 3. In the check for conflicts rule, add the condition 'open' so that it isn't applied to closed or merged PRs --- .mergify.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index f823b02c78..84bacd1668 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -102,6 +102,7 @@ pull_request_rules: # Conflict in the PR - needs: work and a comment to notify a user - name: "label needs: work when there is a conflict" conditions: + - open - conflict actions: label: @@ -158,7 +159,7 @@ pull_request_rules: add: ['do not merge'] # Check if version label is applied - - name: release version is a must for merged PRs + - name: release version is a must for merged PRs part 1 conditions: - merged - -label~=^(release-version) @@ -169,4 +170,22 @@ pull_request_rules: comment: message: This PR does not contain release version label after merging. + # If there is a release version remove 'release version missing' and / or + # release review required + - name: release version is a must for merged PRs part 2 + conditions: + - merged + - -label=^(release-version) + actions: + label: + remove: ['release version missing', 'Release review required'] + + # Clean-up if closed but not merged + - name: remove release version and needs labels + conditions: + - closed + - -merged + actions: + label: + remove_all=True From 0c0233c5ee173089797d4dd1ef76c8654f67f467 Mon Sep 17 00:00:00 2001 From: adbridge Date: Mon, 23 Mar 2020 15:41:44 +0000 Subject: [PATCH 2/5] Mergify: Fix remove_all logical condition --- .mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 84bacd1668..032331dd6d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -187,5 +187,5 @@ pull_request_rules: - -merged actions: label: - remove_all=True + remove_all: True From 7479817a17bd56f7d9efe9c3980a0e76068a4255 Mon Sep 17 00:00:00 2001 From: adbridge Date: Mon, 23 Mar 2020 15:50:59 +0000 Subject: [PATCH 3/5] Move True to true --- .mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 032331dd6d..1f472c8c50 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -187,5 +187,5 @@ pull_request_rules: - -merged actions: label: - remove_all: True + remove_all: true From b048e7b822a5ac62d5d9b3b417dcd8670369a287 Mon Sep 17 00:00:00 2001 From: adbridge Date: Mon, 23 Mar 2020 16:01:14 +0000 Subject: [PATCH 4/5] Mergify has no open condition! Change to not closed --- .mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 1f472c8c50..d007c886d9 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -102,7 +102,7 @@ pull_request_rules: # Conflict in the PR - needs: work and a comment to notify a user - name: "label needs: work when there is a conflict" conditions: - - open + - -closed - conflict actions: label: From f65b886f6dde6ef3a708fe13c1a2089e55600697 Mon Sep 17 00:00:00 2001 From: adbridge Date: Mon, 23 Mar 2020 17:44:12 +0000 Subject: [PATCH 5/5] Fix inverted logic for label release-version present --- .mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index d007c886d9..2d695cbc58 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -175,7 +175,7 @@ pull_request_rules: - name: release version is a must for merged PRs part 2 conditions: - merged - - -label=^(release-version) + - label=^(release-version) actions: label: remove: ['release version missing', 'Release review required']