Skip to content

mergify: add fixes to the conditions #12269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 17, 2020
Merged

mergify: add fixes to the conditions #12269

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
144cb4a
mergify: fix label do not merge, fixes failure with action
0xc0170 Jan 16, 2020
c21cd83
mergify: add note about write access for proper review request
0xc0170 Jan 16, 2020
7962deb
mergify: fix labels with spaces
0xc0170 Jan 16, 2020
f4ee082
mergify: to go to CI, work not matters if approved
0xc0170 Jan 16, 2020
0d483aa
mergify: add from work to CI stage
0xc0170 Jan 16, 2020
957d458
mergify: also remove needs: work if CI ready
0xc0170 Jan 16, 2020
999051f
mergify: simplify needs CI transition
0xc0170 Jan 16, 2020
09529ad
mergify: instead of neutral, use not success neither failure
0xc0170 Jan 16, 2020
6d301d7
mergify: fix jenkins check if smart tester skips pipeline
0xc0170 Jan 16, 2020
c28fbf5
mergify: OR not supported, therefore we rely on pr-head now only
0xc0170 Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@

# Notes: conditions do not check if label is already there if we add or remove later, this is to limit Github API access to
# minimum. If a label is already there and we add it again, nothing should happen (we do 1 less access to Github).
# For instance for needs: work if CI failed, we just add a label as action, don't check if needs: works is already there
# For instance for needs: work if CI failed, we just add a label as action, don't check if needs: works is already there.
#
# Reviewers request needs write access to block PR, otherwise it's just a suggestion on Github, not PR block

pull_request_rules:
# From needs: review to needs: work - reviewers request
Expand Down Expand Up @@ -74,12 +76,11 @@ pull_request_rules:
remove:
- "needs: review"

# From needs: review to needs: CI
# From needs: review or needs: work to needs: CI. One approval means we should be good to start CI
- name: "label needs: CI when at least one reviewers approval"
conditions:
- base~=feature-mergify
# Labels
- "label!=needs: work"
- "label!=needs: preceding PR"

# Reviewers
Expand All @@ -88,14 +89,16 @@ pull_request_rules:

# CI green policy, at least Travis should be green
- status-success~=continuous-integration/travis-ci/pr
# new CI needs to be done
- status-neutral~=continuous-integration/jenkins/pr-head
# new CI needs to be done (neutral does not work, lets check if it failed or passed, if none, we need to run again)
- -status-success~=continuous-integration/jenkins/pr-head
- -status-failure~=continuous-integration/jenkins/pr-head
actions:
label:
add:
- "needs: CI"
remove:
- "needs: review"
- "needs: work"

# Conflict in the PR - needs: work and a comment to notify a user
- name: "label needs: work when there is a conflict"
Expand Down Expand Up @@ -126,7 +129,7 @@ pull_request_rules:
conditions:
- base~=feature-mergify
# Labels
- label!=do not merge
- "label!=do not merge"
- "label=needs: CI"

# Reviewers
Expand All @@ -137,12 +140,12 @@ pull_request_rules:
- status-success~=continuous-integration/travis-ci/pr
# Internal Jenkins - we rely on PR head to provide status
- status-success~=continuous-integration/jenkins/pr-head
# any of the jenkins pipeline needs to be green
- status-success~=^jenkins-ci
# any of the jenkins pipeline needs to be green. We rely on not failure means all good (if skipped or executed)
- -status-failure~=^jenkins-ci
actions:
label:
add:
- ready for merge
- "ready for merge"
remove:
- "needs: CI"

Expand All @@ -151,11 +154,11 @@ pull_request_rules:
conditions:
- base~=feature-mergify
- merged
- label=ready for merge
- "label=ready for merge"
actions:
label:
remove:
- ready for merge
- "ready for merge"

- name: add "do not merge" label when WIP is in title
conditions:
Expand All @@ -164,7 +167,7 @@ pull_request_rules:
actions:
label:
add:
- do not merge
- "do not merge"

# Check if version label is applied
- name: release version is a must for merged PRs
Expand All @@ -175,7 +178,7 @@ pull_request_rules:
actions:
label:
add:
- Release review required
- "Release review required"
comment:
message: This PR does not contain release version label after merging.

Expand Down