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

Enable strict merge on Mergify #3452

Merged
merged 1 commit into from Oct 15, 2020

Conversation

kalikiana
Copy link
Member

@kalikiana kalikiana commented Oct 7, 2020

  • "strict merge" means that open PRs are checked again whenever the target branch has changed. Affected branches can be rebase automatically.
  • Behavior for merge-fast will not change.
  • The new label no-automatic-rebase can be used to retain the current behavior (i.e. your branch is not touched and only merged as-is if possible).

See https://docs.mergify.io/merge-action.html#strict-merge

@kalikiana
Copy link
Member Author

One idea @perlpunk brought up: we could introduce a separate label for PRs that you don't want to be rebased or re-run, like no-automatic-rebase.

.mergify.yml Show resolved Hide resolved
Copy link
Member

@okurz okurz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can try :)

@kalikiana kalikiana marked this pull request as ready for review October 13, 2020 07:28
The new label no-automatic-rebase can be used to disable this new behavior.
@codecov
Copy link

codecov bot commented Oct 15, 2020

Codecov Report

Merging #3452 into master will increase coverage by 0.06%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3452      +/-   ##
==========================================
+ Coverage   95.52%   95.59%   +0.06%     
==========================================
  Files         366      366              
  Lines       31556    31557       +1     
==========================================
+ Hits        30144    30166      +22     
+ Misses       1412     1391      -21     
Impacted Files Coverage Δ
lib/OpenQA/Parser/Format/XUnit.pm 98.33% <100.00%> (+0.02%) ⬆️
t/05-scheduler-full.t 97.94% <0.00%> (+0.51%) ⬆️
t/lib/OpenQA/SeleniumTest.pm 89.07% <0.00%> (+1.09%) ⬆️
t/lib/OpenQA/Test/Utils.pm 68.94% <0.00%> (+3.70%) ⬆️
t/43-scheduling-and-worker-scalability.t 91.86% <0.00%> (+4.06%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 92b420e...125ce4d. Read the comment docs.

@kalikiana kalikiana merged commit 2a05666 into os-autoinst:master Oct 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants