3 Commits

Author	SHA1	Message	Date
Niels de Vos	a5c777bf33	Use Smart-mode for "Strict Merge" to enable automatic rebase ... Enabling Smart-mode for "Strict Merge" causes Mergify to do a rebase of the PR before merging. The rebase will trigger CI runs again, and merging will be done only when the CI results are successful. See-also: https://docs.mergify.io/actions.html#merge Signed-off-by: Niels de Vos <ndevos@redhat.com>	2020-11-04 10:01:55 -05:00
Niels de Vos	92b10d8699	Include all status checks explicitly in the Mergify configuration ... Unfortunately it is not recommended to use a regular expression to check for the CI status of multiple tests. In case some tests do not run and fail to report the status, Mergify will not know something is wrong and PRs might get merged. The only way to make sure all status checks have passed successfully, is to list them all separately. See-also: https://docs.mergify.io/conditions.html#validating-all-status-check Signed-off-by: Niels de Vos <ndevos@redhat.com>	2020-11-03 12:36:46 -05:00
Niels de Vos	7160ceaa3a	Add configuration for Mergify ... These rules for Mergify do the following: 1. dismiss review +1's when a PR is updated but keep any -1 reviews, so the reviewer needs to confirm the update addresses the comment(s) 2. merge the PR when there are 2 (or more) positive reviews, and no negative ones don't merge when the 'do-not-merge' label is added to the PR also require that the status checks (CI) has passed 3. in case there are merge conflicts, Mergify will leave a message asking for a rebase Documentation: https://docs.mergify.io/configuration.html Signed-off-by: Niels de Vos <ndevos@redhat.com>	2020-11-02 09:11:43 -05:00