reconfigure mergify (#5499)

* configure mergify

* drop gha

* drop commented section

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Roger Shieh <sh.rog@protonmail.ch>
This commit is contained in:
Jirka Borovec 2021-01-14 16:53:12 +01:00 committed by Jirka Borovec
parent 7b42494d0e
commit f8abcf707c
1 changed files with 42 additions and 56 deletions

View File

@ -12,59 +12,45 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
#pull_request_rules: pull_request_rules:
#
# - name: Automatic merge on approval - name: warn on conflicts
# conditions: conditions:
# - base=master - conflict
# # number of review approvals - -draft # filter-out GH draft PRs
# - "#approved-reviews-by>=3" - -label="has conflicts"
# # no waiting or assigned review actions:
# - "#review-requested=0" # comment:
# # no requested chnages from any reviewer # message: This pull request is now in conflict... :(
# - "#changes-requested-reviews-by=0" label:
# # this serves as ALL check has to pass as we have actually around 40 tests in total add: [ "has conflicts" ]
# - "#status-success>=54"
# # this is just in case since we rely on GPU tests (note: redundand to the above) - name: resolved conflicts
# - status-success=continuous-integration/drone/pr conditions:
# - "status-success=ci/circleci: TPU-tests" - -conflict
# # this is patter-like, unofrunatly serves as `any(...)` (note: redundand to the above) - label="has conflicts"
# #- "status-success~=^ci/circleci:" - -draft # filter-out GH draft PRs
# # no conflict with master branch - -merged # not merged yet
# - -conflict - -closed
# # was not closed yet actions:
# - -closed label:
# # filter-out GH draft PRs remove: [ "has conflicts" ]
# - -draft
# actions: - name: update PR
# delete_head_branch: {} conditions:
# merge: - conflict
# # https://doc.mergify.io/merge-action.html#strict-merge - -draft # filter-out GH draft PRs
# # (on head branch) $ git merge --no-ff base - label="0:] Ready-To-Go"
# # (on head branch) # Wait for CI to go green actions:
# # (on head branch) # Squash all commits update: {}
# # (on base branch) $ git merge --ff head
# strict: true - name: add core reviewer
# method: squash conditions:
# comment: - -conflict # skip if conflict
# message: Great job! =) - -draft # filter-out GH draft PRs
# - label="0:] Ready-To-Go"
# - name: warn on conflicts - "#approved-reviews-by<3" # number of review approvals
# conditions: actions:
# - conflict request_reviews:
# # filter-out GH draft PRs teams:
# - -draft - core-contributors
# actions:
# comment:
# message: This pull request is now in conflict... :(
#
# - name: add core reviewer
# conditions:
# # filter-out GH draft PRs
# - -draft
# # number of review approvals
# - "#approved-reviews-by<3"
# actions:
# request_reviews:
# teams:
# - core-contributors