Skip to content
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.

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

mergify.yml: add config file for mergify.io #2004

Merged
merged 3 commits into from Feb 12, 2019

Conversation

@grondo
Copy link
Contributor

commented Feb 11, 2019

Add an initial config file for mergify.io with strict merge enabled.
This config file enables the mergify bot to auto-rebase and merge
PRs once all of the following conditions are met:

  • The label "merge-when-passing" is applied
  • The label "work-in-progress" is not applied
  • The PR title doesn't start with "[wip|WIP]" or "wip" or "WIP"
  • Travis-CI checks pass
  • Codecov doesn't report a drop in project coverage
  • There is at least one approving review by a member of flux team
  • There are no outstanding changes requested.

I have the strict mode set to "auto" instead of "true" which supposedly will only rebase one PR at a time instead of all pending PRs on a change to master.

I haven't been able to test some of the features, i.e. I'm not sure if I got the title matching right, and I couldn't check to see if the syntax for the flux-framework "core" team is correct.

After this is merged I can enable mergify.io on the flux-core repo and we can carefully try this out.

Add an initial config file for mergify.io with strict merge enabled.
This config file enables the mergify bot to auto-rebase and merge
PRs once all of the following conditions are met:

 - The label "merge-when-passing" is applied
 - The label "work-in-progress" is not applied
 - The PR title doesn't start with "[wip|WIP]" or "wip" or "WIP"
 - Travis-CI checks pass
 - Codecov doesn't report a drop in project coverage
 - There is at least one approving review by a member of flux team
 - There are no outstanding changes requested.
@grondo

This comment has been minimized.

Copy link
Contributor Author

commented Feb 11, 2019

One builder failed with what looks like expiration of grace timeout in kvs-stress test:

# passed all 18 test(s)
lt-flux-broker: module 'kvs' was not cleanly shutdown
lt-flux-broker: module 'content-sqlite' was not cleanly shutdown
lt-flux-broker: module 'kvs' was not cleanly shutdown
flux-start: 1 (pid 24078) Killed
1..18
ERROR: t1003-kvs-stress.t - exited with status 137 (terminated by signal 9?)
grondo added 2 commits Feb 12, 2019
Problem: There is some "noise" in Codecov.io coverage reports as
run via Travis-CI (possibly due to running tests in parallel?), and
PRs that do not even affect C code may affect coverage of the
project as a whole.

To reduce false positives, adjust the "failing" codecov threshold
from the defaul to 0.1%, which should give some buffer for noise
in the coverage test results.
Adjust codecov.io range from 50-100 to 65-100 so that 65% coverage
shows as red in reports.

Additionally, it is confusing that codecov.io updates its old post
instead of posting a new report when a branch is updated. Change
the comment behavior to "new" so Codecov deletes the old comment
and posts a new one on each run.
@grondo

This comment has been minimized.

Copy link
Contributor Author

commented Feb 12, 2019

Along with this PR, I've also updated the codecov config for the project to allow up to 0.1% coverage drop in the project and still have the codecov/project check pass. This should work around the false positive coverage drops we see in the coverage reports.

I also made another couple edits to the codecov config.

@garlick

This comment has been minimized.

Copy link
Member

commented Feb 12, 2019

Sounds great. Can this go in once green? I say all in with this thing and if we don't like it, we can always back it out.

@grondo

This comment has been minimized.

Copy link
Contributor Author

commented Feb 12, 2019

I think, if everyone is satisfied with the series of enabled conditions.

@codecov-io

This comment has been minimized.

Copy link

commented Feb 12, 2019

Codecov Report

Merging #2004 into master will decrease coverage by 0.02%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #2004      +/-   ##
==========================================
- Coverage   80.18%   80.15%   -0.03%     
==========================================
  Files         195      195              
  Lines       35150    35150              
==========================================
- Hits        28185    28176       -9     
- Misses       6965     6974       +9
Impacted Files Coverage Δ
src/modules/connector-local/local.c 73.77% <0%> (-1.04%) ⬇️
src/modules/kvs/kvs.c 66.33% <0%> (-0.15%) ⬇️
@grondo

This comment has been minimized.

Copy link
Contributor Author

commented Feb 12, 2019

Nice, Mergify even has a future config checker check.

@garlick

This comment has been minimized.

Copy link
Member

commented Feb 12, 2019

Thanks!

@garlick garlick merged commit 790562e into flux-framework:master Feb 12, 2019
5 checks passed
5 checks passed
Mergify — disabled due to configuration change Mergify configuration has been modified
Details
Mergify — future config checker The new Mergify configuration is valid
Details
codecov/patch Coverage not affected when comparing 9cd864e...8faece4
Details
codecov/project 80.15% (-0.03%) compared to 9cd864e
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@grondo grondo deleted the grondo:mergify branch Mar 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.