From: Richard Earnshaw <[email protected]>

This adds some initial data, mainly for experimentation, that will be
needed for construcing the maintainer teams on the forge and for
constructing a CODEOWNERS file from that data.

ChangeLog:

        * MAINTAINERS.yml (users): Add forgeid for some users.
        (subsystems): Add some labels and teams to the data.

contrib/ChangeLog:

        * maintainer_utils.py (schema): Permit 'forgeid' on users
        entries and 'teams' on subsystem entries.
---
 MAINTAINERS.yml             | 43 +++++++++++++++++++++++++++++++------
 contrib/maintainer_utils.py | 13 +++++++++++
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 25620bf276a8f..25d48ce2239f4 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -174,6 +174,7 @@ users:
   - Maintainer: forge integration
   - WriteAfter
   account: rdfm
+  forgeid: rdfm
 - sn: Barany
   cn: Gergö Barany
   email:
@@ -828,6 +829,7 @@ users:
   - Maintainer: vectorizer (+ tree-if-conv)
   - WriteAfter
   account: tnfchris
+  forgeid: tnfchris
 - sn: Christopher
   cn: Eric Christopher
   email:
@@ -929,6 +931,7 @@ users:
   - Reviewer: aarch64 port
   - WriteAfter
   account: acoplan
+  forgeid: acoplan
 - sn: Corallo
   cn: Andrea Corallo
   email:
@@ -1134,6 +1137,7 @@ users:
   - Reviewer: aarch64 port
   - WriteAfter
   account: wilco
+  forgeid: Wilco
 - sn: Dimitrov
   cn: Dimitar Dimitrov
   email:
@@ -1224,6 +1228,7 @@ users:
   - Maintainer: arm port
   - WriteAfter
   account: rearnsha
+  forgeid: rearnsha
 - sn: Eckhardt
   cn: Jason Eckhardt
   email:
@@ -3077,6 +3082,7 @@ users:
   - Reviewer: arm port (MVE)
   - WriteAfter
   account: clyon
+  forgeid: clyon
 - sn: Ma
   cn: Jin Ma
   email:
@@ -3188,6 +3194,7 @@ users:
   - WriteAfter
   - DCO: [email protected]
   account: jemarch
+  forgeid: jemarch
 - sn: Markianos-Wright
   cn: Stamatis Markianos-Wright
   email:
@@ -3925,6 +3932,7 @@ users:
   - DCO: [email protected]
   - DCO: [email protected]
   account: pinskia
+  forgeid: pinskia
 - sn: Pitre
   cn: Nicolas Pitre
   email:
@@ -4967,6 +4975,7 @@ users:
   - WriteAfter
   - DCO: [email protected]
   account: ktkachov
+  forgeid: ktkachov
 - sn: Tobler
   cn: Andreas Tobler
   email:
@@ -5226,6 +5235,7 @@ users:
   - WriteAfter
   - DCO: [email protected]
   account: redi
+  forgeid: redi
 - sn: Walfridsson
   cn: Krister Walfridsson
   email:
@@ -5753,7 +5763,10 @@ subsystems:
   labels: []
 - name: Algol 68
   class: Lang
-  labels: []
+  labels:
+    - Lang/algol68
+  teams:
+    - Maintainers.Algol68
 - name: Android sub-port
   class: OS
   labels: []
@@ -5824,9 +5837,14 @@ subsystems:
 - name: aarch64 ldp/stp
   class: CPU
   labels: []
+  teams:
+    - Maintainers.AArch64
 - name: aarch64 port
   class: CPU
-  labels: []
+  labels:
+    - Target/aarch64
+  teams:
+    - Maintainers.AArch64
 - name: aix
   class: OS
   labels: []
@@ -5841,9 +5859,16 @@ subsystems:
   labels: []
 - name: arm port
   class: CPU
-  labels: []
+  labels:
+    - Target/arm
+  teams:
+    - Maintainers.Arm
 - name: arm port (MVE)
-  labels: []
+  class: CPU
+  labels:
+    - Target/arm
+  teams:
+    - Maintainers.Arm
 - name: avr port
   class: CPU
   labels: []
@@ -5861,7 +5886,10 @@ subsystems:
   labels: []
 - name: c++ runtime libs
   class: Subsystem
-  labels: []
+  labels:
+    - Library/libstdc++
+  teams:
+    - Maintainers.libstdcplusplus
 - name: c++ runtime libs special modes
   class: Subsystem
   labels: []
@@ -5913,7 +5941,10 @@ subsystems:
   labels: []
 - name: forge integration
   class: Subsystem
-  labels: []
+  labels:
+    - Misc/forge
+  teams:
+    - Maintainers.forge
 - name: fp-bit
   class: Subsystem
   labels: []
diff --git a/contrib/maintainer_utils.py b/contrib/maintainer_utils.py
index 9fc636d8b5623..4016f29e6ac01 100755
--- a/contrib/maintainer_utils.py
+++ b/contrib/maintainer_utils.py
@@ -111,6 +111,10 @@ maintainer_schema = {
                         'minlength': 1,
                         'pattern': '[a-zA-Z][a-zA-Z0-9]*',
                     },
+                    'forgeid': {
+                        'type': 'string',
+                        'minlength': 1,
+                    },
                     'aliases': {
                         'type': 'array',
                         'minlength': 1,
@@ -150,8 +154,17 @@ maintainer_schema = {
                             'pattern': label_pattern,
                         },
                     },
+                    'teams': {
+                        'type': 'array',
+                        'minlength': 1,
+                        'items': {
+                            'type': 'string',
+                            'minlength': 3,
+                        },
+                    },
                 },
                 'additionalProperties': False,
+                # Todo, add 'team' once the data is fully populated.
                 'required': ['name', 'labels'],
             },
         },
-- 
2.54.0

Reply via email to