From 30dbeda481016340006457b17066bc72312fd19a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <info@kchr.de>
Date: Thu, 30 Nov 2023 09:26:06 +0100
Subject: [PATCH 1/2] Relax approval requirements on CI files

- Remove the old Cumulus checks as these files do not exist anymore
- Relax requirements on CI files to also give two core devs the right to
  change these files
- Relax requirements on the review bot configuration itself as well.
---
 .github/review-bot.yml | 51 ++++++++++++++----------------------------
 1 file changed, 17 insertions(+), 34 deletions(-)

diff --git a/.github/review-bot.yml b/.github/review-bot.yml
index c522988f02e6..3906b10dae7a 100644
--- a/.github/review-bot.yml
+++ b/.github/review-bot.yml
@@ -1,30 +1,34 @@
 rules:
   - name: CI files
+    countAuthor: true
     condition:
-      include: 
+      include:
         - ^\.gitlab-ci\.yml
         - ^docker/.*
         - ^\.github/.*
         - ^\.gitlab/.*
         - ^\.config/nextest.toml
         - ^\.cargo/.*
-      exclude: 
+      exclude:
         - ^\.gitlab/pipeline/zombienet.*
-    minApprovals: 2
-    type: basic
-    teams:
-      - ci
-      - release-engineering
+    type: "or"
+    reviewers:
+      - minApprovals: 2
+        teams:
+          - ci
+      - minApprovals: 2
+        teams:
+          - core-devs
 
   - name: Audit rules
     type: basic
     condition:
-      include: 
+      include:
         - ^polkadot/runtime\/(kusama|polkadot|common)\/.*
         - ^polkadot/primitives/src\/.+\.rs$
         - ^substrate/primitives/.*
         - ^substrate/frame/.*
-      exclude: 
+      exclude:
         - ^polkadot/runtime\/(kusama|polkadot)\/src\/weights\/.+\.rs$
         - ^substrate\/frame\/.+\.md$
     minApprovals: 1
@@ -59,28 +63,10 @@ rules:
     teams:
       - core-devs
 
-  # cumulus
-  - name: Runtime files cumulus
-    countAuthor: true
-    condition:
-      include:
-        - ^cumulus/parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$
-        - ^cumulus/parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$
-        - ^cumulus/parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$
-        - ^cumulus/parachains/common/src/[^/]+\.rs$
-    type: and-distinct
-    reviewers:
-      - minApprovals: 1
-        teams:
-          - locks-review
-      - minApprovals: 1
-        teams:
-          - polkadot-review
-
   # if there are any changes in the bridges subtree (in case of backport changes back to bridges repo)
   - name: Bridges subtree files
     type: basic
-    condition: 
+    condition:
       include:
         - ^bridges/.*
     minApprovals: 1
@@ -88,10 +74,9 @@ rules:
       - bridges-core
 
   # substrate
-
   - name: FRAME coders substrate
     condition:
-      include: 
+      include:
         - ^substrate/frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))
     type: "and"
     reviewers:
@@ -104,8 +89,9 @@ rules:
 
   # Protection of THIS file
   - name: Review Bot
+    countAuthor: true
     condition:
-      include: 
+      include:
         - review-bot\.yml
     type: "and"
     reviewers:
@@ -115,9 +101,6 @@ rules:
       - minApprovals: 1
         teams:
           - locks-review
-      - minApprovals: 1
-        teams:
-          - ci
 
 preventReviewRequests:
   teams:

From b0c542aa8005a9d8161073323ba0110f5e3474d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <info@kchr.de>
Date: Wed, 6 Dec 2023 22:17:56 +0100
Subject: [PATCH 2/2] Remove old cruft

---
 .github/review-bot.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/review-bot.yml b/.github/review-bot.yml
index 3906b10dae7a..aa4ab8a69e02 100644
--- a/.github/review-bot.yml
+++ b/.github/review-bot.yml
@@ -24,12 +24,11 @@ rules:
     type: basic
     condition:
       include:
-        - ^polkadot/runtime\/(kusama|polkadot|common)\/.*
+        - ^polkadot/runtime/common/.*
         - ^polkadot/primitives/src\/.+\.rs$
         - ^substrate/primitives/.*
         - ^substrate/frame/.*
       exclude:
-        - ^polkadot/runtime\/(kusama|polkadot)\/src\/weights\/.+\.rs$
         - ^substrate\/frame\/.+\.md$
     minApprovals: 1
     allowedToSkipRule:
@@ -45,13 +44,8 @@ rules:
         - .*
       # excluding files from 'Runtime files' and 'CI files' rules
       exclude:
-        - ^polkadot/runtime/(kusama|polkadot)/src/[^/]+\.rs$
-        - ^cumulus/parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$
-        - ^cumulus/parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$
-        - ^cumulus/parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$
         - ^cumulus/parachains/common/src/[^/]+\.rs$
         - ^substrate/frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))
-        - ^polkadot/runtime/(kusama|polkadot)/src/[^/]+\.rs$
         - ^\.gitlab-ci\.yml
         - ^docker/.*
         - ^\.github/.*