diff --git a/.github/mergify.yml b/.github/mergify.yml index 2dfcf02e5c949..d81b90050f9c8 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -5,9 +5,6 @@ queue_rules: - name: release-1.2 merge_conditions: [] checks_timeout: 4h - - name: release-1.1 - merge_conditions: [] - checks_timeout: 4h pull_request_rules: - name: Automatic queue on approval for main @@ -15,6 +12,7 @@ pull_request_rules: - "#changes-requested-reviews-by<=0" - label!=do-not-merge/wip - base=main + - approved-reviews-by=fengttt actions: queue: name: main @@ -31,7 +29,7 @@ pull_request_rules: - "#changes-requested-reviews-by<=0" - label!=do-not-merge/wip - base=1.2-dev - - approved-reviews-by=fengttt + - approved-reviews-by=sukki37 actions: queue: name: release-1.2 @@ -43,29 +41,27 @@ pull_request_rules: Approved by: @{{ approved_reviews_by | join(', @') }} - - name: Automatic queue on approval for release-1.1 - conditions: - - "#changes-requested-reviews-by<=0" - - label!=do-not-merge/wip - - base=1.1-dev - - approved-reviews-by=fengttt - actions: - queue: - name: release-1.1 - method: squash - commit_message_template: | - {{ title }} (#{{ number }}) - - {{ body.split("___\n\n### **PR Type**")[0] | trim | get_section("## What this PR does / why we need it:") }} - - Approved by: @{{ approved_reviews_by | join(', @') }} - - name: Auto update branch conditions: - created-at>=00:10 ago actions: update: + - name: Auto Request Reviewer For main + conditions: + - base=main + actions: + request_reviews: + users: + - fengttt + - name: Auto Request Reviewer For 1.2-dev + conditions: + - base!=main + actions: + request_reviews: + users: + - sukki37 + - name: label for Bug conditions: - body~=(?im)- \[x\] BUG diff --git a/CODEOWNERS b/CODEOWNERS index 1a5a3e15063b5..0bc580ae29b5c 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,8 +1,6 @@ # default owner for stuff that is not explicitly set for ownership # for triage only -* @fengttt - # github and CI-related stuff .github @sukki37 .github/actions @sukki37