Commit Graph

31 Commits (d1d6bf51b387ef39f97320b2febd5d79231682ba)

Author SHA1 Message Date
Martin Kojtal a4a07ea5e4 mergify: add release type 2.2
Also handle label removal for this new type
2020-06-04 14:24:22 +01:00
Martin Kojtal 75a8e074c5 mergify: add release type 2020-06-04 13:44:39 +01:00
Martin Kojtal a7cac10916 mergify: add 5.15 branch rule 2020-04-02 07:29:47 +01:00
Martin Kojtal c60ec041a9 mergify: remove spaces 2020-04-01 15:53:21 +01:00
adbridge f65b886f6d Fix inverted logic for label release-version present 2020-03-23 17:44:12 +00:00
adbridge b048e7b822 Mergify has no open condition! Change to not closed 2020-03-23 16:01:14 +00:00
adbridge 7479817a17 Move True to true 2020-03-23 15:50:59 +00:00
adbridge 0c0233c5ee Mergify: Fix remove_all logical condition 2020-03-23 15:41:44 +00:00
adbridge 5c7de75661 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
2020-03-23 13:51:19 +00:00
Martin Kojtal a06abda229 mergify: add "mergify skip" label
This is useful if we want to drive PR. There are situations when mergify is not ideal,
and we want to overwrite its rules.

I applied the label for some actions that we can overwrite.
2020-02-26 10:40:00 +00:00
Martin Kojtal 59746d7397 mergify: CI only if PR is without conflicts
Conflict -> needs: work
2020-02-07 15:09:57 +00:00
Martin Kojtal 0b0ae16bf9 Mergify: fix release version label
Check if release review is not applied for merged PR. If not, we use "release version missing" label.
2020-02-04 13:36:37 +00:00
Anna Bridge fecd1c2a27
Merge branch 'master' into feature-mergify 2020-01-21 13:11:38 +00:00
Anna Bridge 7cbc8bb78d
Make all add /remove labels consistent, format wise 2020-01-21 13:02:48 +00:00
Anna Bridge 958d4620b6
Multiple labels need to be in an array of strings
Updated the remove conditions with multiple labels to make them arrays of strings
2020-01-21 12:31:58 +00:00
Martin Kojtal c2b65fdad3 mergify: dismiss reviewers if PR is updated 2020-01-20 14:41:22 +00:00
Martin Kojtal adfa73665d mergify: remove needs CI if CI fails 2020-01-20 14:03:17 +00:00
Martin Kojtal bccc140516 Revert "mergify: enable it only for feature-mergify"
This reverts commit e4cd9387dc.
2020-01-17 12:18:16 +00:00
Martin Kojtal c28fbf524f mergify: OR not supported, therefore we rely on pr-head now only
jenkins hooks are not always present, therefore we can't rely on them. Lets rely on
not failing for jenkins-ci hooks.

This should cover when they are not there due to smart tester, or executed and green. If failed, the condition would be false.
2020-01-16 15:15:25 +00:00
Martin Kojtal 6d301d7404 mergify: fix jenkins check if smart tester skips pipeline 2020-01-16 15:03:43 +00:00
Martin Kojtal 09529ad0c5 mergify: instead of neutral, use not success neither failure 2020-01-16 15:03:42 +00:00
Martin Kojtal 999051fc2d mergify: simplify needs CI transition
from review or work - approval and update (pr head yellow) should result in CI run. These 2 preconditions should be
sufficient to move to CI stage.
2020-01-16 15:03:42 +00:00
Martin Kojtal 957d458a24 mergify: also remove needs: work if CI ready
There are two cases here: either PR was in  review or needs work. in any case, new
CI should be started as pr-head is yellow. Once it completes, based on reviews, we can move
to ready for merge or back to needs work if fails.
2020-01-16 15:03:41 +00:00
Martin Kojtal 0d483aad0a mergify: add from work to CI stage 2020-01-16 15:03:41 +00:00
Martin Kojtal f4ee0829ad mergify: to go to CI, work not matters if approved
As pr-head is neutral, means there was a push, we should test PR again and if all passed,
should be marked as ready for merge.
2020-01-16 15:03:41 +00:00
Martin Kojtal 7962deb881 mergify: fix labels with spaces 2020-01-16 15:03:18 +00:00
Martin Kojtal c21cd8325b mergify: add note about write access for proper review request 2020-01-16 15:03:17 +00:00
Martin Kojtal 144cb4a05f mergify: fix label do not merge, fixes failure with action 2020-01-16 15:03:17 +00:00
Martin Kojtal 55d51a9031 mergify: fix conflict - remove also CI label 2020-01-14 15:14:37 +00:00
Martin Kojtal e4cd9387dc mergify: enable it only for feature-mergify
This will be reverted once mergify works with the PR workflow.
One rule for each condition - base is feature-mergify.
2020-01-14 13:16:53 +00:00
Martin Kojtal ec0c69ce14 PR workflow: add mergify
This config should always follow our worklof and other way around. They should both be in sync.

What can mergify do? Check PR status (labels, reviewers) and act on it. First step would be to not merge anything, just use labels and help us to keep PRs up to date. Less manual work.

If this works, we can get CI to check specific labels to trigger CI (or use commands) and other things, this needs more work.
2020-01-14 13:16:47 +00:00