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             | 54 ++++++++++++++++++++++++++++++++-----
 contrib/maintainer_utils.py | 13 +++++++++
 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 6daa1d3c5d909..7fcd284a197fa 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -204,6 +204,7 @@ users:
   - Maintainer: forge integration
   - WriteAfter
   account: rdfm
+  forgeid: rdfm
 - sn: Barany
   cn: Gergö Barany
   email:
@@ -393,6 +394,7 @@ users:
   - Reviewer: LTO
   - WriteAfter
   account: rguenth
+  forgeid: RichardBiener
   inactive_email:
   - [email protected]
   - [email protected]
@@ -692,6 +694,7 @@ users:
   - Maintainer: libphobos
   - WriteAfter
   account: ibuclaw
+  forgeid: ibuclaw
   inactive_email:
   - [email protected]
 - sn: Buettner
@@ -971,6 +974,7 @@ users:
   - Maintainer: vectorizer (+ tree-if-conv)
   - WriteAfter
   account: tnfchris
+  forgeid: tnfchris
 - sn: Christopher
   cn: Eric Christopher
   email:
@@ -1026,6 +1030,7 @@ users:
   - Maintainer: libgrust
   - WriteAfter
   account: cohenarthur
+  forgeid: cohenarthur
 - sn: Cohen
   cn: William Cohen
   email:
@@ -1090,6 +1095,7 @@ users:
   - Reviewer: aarch64 port
   - WriteAfter
   account: acoplan
+  forgeid: acoplan
 - sn: Corallo
   cn: Andrea Corallo
   email:
@@ -1337,6 +1343,7 @@ users:
   - Reviewer: aarch64 port
   - WriteAfter
   account: wilco
+  forgeid: Wilco
   inactive_email:
   - [email protected]
 - sn: Dimitrov
@@ -1398,6 +1405,7 @@ users:
   - Maintainer: c++ runtime libs special modes
   - WriteAfter
   account: fdumont
+  forgeid: fdumont
   inactive_email:
   - [email protected]
 - sn: Dvorak
@@ -1441,6 +1449,7 @@ users:
   - Maintainer: arm port
   - WriteAfter
   account: rearnsha
+  forgeid: rearnsha
   inactive_email:
   - [email protected]
   - [email protected]
@@ -2666,6 +2675,7 @@ users:
   - Reviewer: libsanitizer, asan.cc
   - WriteAfter
   account: jakub
+  forgeid: jakub
   inactive_email:
   - [email protected]
   - [email protected]
@@ -3612,6 +3622,7 @@ users:
   - Reviewer: arm port (MVE)
   - WriteAfter
   account: clyon
+  forgeid: clyon
   inactive_email:
   - [email protected]
   - [email protected]
@@ -3707,6 +3718,7 @@ users:
   - Maintainer: static analyzer
   - WriteAfter
   account: dmalcolm
+  forgeid: dmalcolm
 - sn: Malcomson
   cn: Matthew Malcomson
   email:
@@ -3742,6 +3754,7 @@ users:
   - WriteAfter
   - DCO: [email protected]
   account: jemarch
+  forgeid: jemarch
 - sn: Markianos-Wright
   cn: Stamatis Markianos-Wright
   email:
@@ -3935,6 +3948,7 @@ users:
   - Maintainer: dwarf debugging code
   - WriteAfter
   account: jason
+  forgeid: jason
   inactive_email:
   - [email protected]
   - [email protected]
@@ -4212,6 +4226,7 @@ users:
   - Reviewer: driver
   - WriteAfter
   account: jsm28
+  forgeid: jsm28
   inactive_email:
   - [email protected]
   - [email protected]
@@ -4657,6 +4672,7 @@ users:
   - DCO: [email protected]
   - DCO: [email protected]
   account: pinskia
+  forgeid: pinskia
   inactive_email:
   - [email protected]
   - [email protected]
@@ -5161,6 +5177,7 @@ users:
   - Reviewer: wide-int
   - WriteAfter
   account: rsandifo
+  forgeid: rsandifo
   inactive_email:
   - [email protected]
   - [email protected]
@@ -5180,6 +5197,7 @@ users:
   - Maintainer: objective-c/c++
   - WriteAfter
   account: iains
+  forgeid: iains
   inactive_email:
   - [email protected]
   - [email protected]
@@ -5352,6 +5370,7 @@ users:
   - Maintainer: OpenACC
   - WriteAfter: [email protected]
   account: tschwinge
+  forgeid: tschwinge
   inactive_email:
   - [email protected]
   - [email protected]
@@ -5945,6 +5964,7 @@ users:
   - WriteAfter
   - DCO: [email protected]
   account: ktkachov
+  forgeid: ktkachov
   inactive_email:
   - [email protected]
 - sn: Tobler
@@ -6248,6 +6268,7 @@ users:
   - WriteAfter
   - DCO: [email protected]
   account: redi
+  forgeid: redi
   inactive_email:
   - [email protected]
   - [email protected]
@@ -6852,7 +6873,10 @@ subsystems:
   labels: []
 - name: Algol 68
   class: Lang
-  labels: []
+  labels:
+  - Lang/algol68
+  teams:
+  - Maintainers.Algol68
 - name: Android sub-port
   class: OS
   labels: []
@@ -6923,9 +6947,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: []
@@ -6940,9 +6969,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: []
@@ -6960,7 +6996,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: []
@@ -7012,7 +7051,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 878439eb365fd..9dfc6f0fea62b 100755
--- a/contrib/maintainer_utils.py
+++ b/contrib/maintainer_utils.py
@@ -118,6 +118,10 @@ maintainer_schema = {
                         'minlength': 1,
                         'pattern': '[a-zA-Z][a-zA-Z0-9]*',
                     },
+                    'forgeid': {
+                        'type': 'string',
+                        'minlength': 1,
+                    },
                     'aliases': {
                         'type': 'array',
                         'minlength': 1,
@@ -157,8 +161,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