Merge pull request #255 from stephanosio/gh-maintainers_are_also_collaborators

sync_team_membership: Add maintainers to collaborators team

Author: stephanosio

terraform/github-zephyrproject-rtos/scripts/sync_team_membership.sh

@@ -47,11 +47,9 @@ echo "${maintainers_data}" | yq &> /dev/null || (
 
 # Get the list of all collaborators
 all_collaborators=$(echo "${maintainers_data}" | yq -r '.[].collaborators.[]')
-all_collaborators=$(echo "${all_collaborators}" | sort -f -u)
 
 # Get the list of all maintainers
 all_maintainers=$(echo "${maintainers_data}" | yq -r '.[].maintainers.[]')
-all_maintainers=$(echo "${all_maintainers}" | sort -f -u)
 
 # Read global admin list
 global_admins=$(<${manifest_path}/global-admins.csv)
@@ -79,7 +77,7 @@ write_team_member_list()
   done
 }
 
-write_team_member_list "${collaborators_csv}" "${all_collaborators}"
+write_team_member_list "${collaborators_csv}" "${all_collaborators} ${all_maintainers}"
 write_team_member_list "${maintainers_csv}" "${all_maintainers}"
 
 # Add all maintainers and collaborators to the contributors team member list
@@ -88,8 +86,19 @@ contributors_csv="${manifest_path}/team/team-members/contributors.csv"
 tail -n +2 "${maintainers_csv}" >> "${contributors_csv}"
 tail -n +2 "${collaborators_csv}" >> "${contributors_csv}"
 
-contributors_data=$(tail -n +2 "${contributors_csv}")
-contributors_data=$(echo "${contributors_data}" | sort -f | uniq -i)
+# Keep all team member list files sorted
+sort_csv()
+{
+  csv_file="$1"
+
+  csv_header=$(head -n 1 "${csv_file}")
+  csv_data=$(tail -n +2 "${csv_file}")
+  csv_data=$(echo "${csv_data}" | sort -f | uniq -i)
+
+  echo "${csv_header}" > "${csv_file}"
+  echo "${csv_data}" >> "${csv_file}"
+}
 
-echo "username,role" > "${contributors_csv}"
-echo "${contributors_data}" >> "${contributors_csv}"
+sort_csv "${contributors_csv}"
+sort_csv "${collaborators_csv}"
+sort_csv "${maintainers_csv}"

terraform/github-zephyrproject-rtos/team/team-members/collaborators.csv

@@ -1,37 +1,46 @@
 username,role
+3rang,member
 57300,member
+aaillet,member
 aaronemassey,member
 aaronyegx,member
 aasinclair,member
 abrodkin,member
 adakus,member
 aescolar,member
+afontaine-invn,member
 ajf58,member
+akanisetti,member
 akredalen,member
 albertofloyd,member
 AlessandroLuo,member
 alevkoy,member
 alexanderwachter,member
 alvsun,member
+alwa-nordic,member
 alxelax,member
 anangl,member
 Andrewpini,member
 andrzej-kaczmarek,member
+andy-liu-telink,member
 andyross,member
 ankuns,member
 arnopo,member
+aronlander-pe,member
 asbjornsabo,member
 asemjonovs,member
 asm5878,member
 asmellby,member
 avisconti,member
 avolmat-st,member
+awojasinski,member
 axelnxp,member
 Ayush1325,member
 babrsn,member
 bbolen,member
 BeckmaR,member
 benothmn-st,member
+binhnguyen2434,member
 bjarki-andreasen,member
 bjorniuppsala,member
 blauret,member
@@ -43,12 +52,17 @@ canisLupus1313,member
 carlescufi,maintainer
 carlocaione,member
 casparfriedrich,member
+Casper-Bonde-Bose,member
 ceolin,member
 cfriedt,member
+Chenhongren,member
+ChiHuaL,member
 clamattia,member
 con-pax,member
 congnguyenhuu,member
 cvinayak,member
+cyliangtw,member
+d3zd3z,member
 danieldegrasse,member
 Dat-NguyenDuy,member
 dbaluta,member
@@ -57,21 +71,28 @@ dcpleung,member
 de-nordic,member
 decsny,member
 DerekSnell,member
+Dino-Li,member
 dipakgmx,member
 djiatsaf-st,member
+dkalowsk,member
 dleach02,member
 dnltz,member
+doki-nordic,member
 duda-patryk,member
 duynguyenxa,member
 edersondisouza,member
 edmont,member
 EmilioCBen,member
 erbr-ot,member
+eriktamlin,member
 erwango,member
 etienne-lms,member
+evgeniy-paltsev,member
 fabiobaltieri,member
 facchinm,member
 faxe1008,member
+finikorg,member
+firscity,member
 fkokosinski,member
 FRASTM,member
 fredrikdanebjer,member
@@ -81,6 +102,7 @@ gchwier,member
 gdengi,member
 George-Stefan,member
 GeorgeCGV,member
+ghu0510,member
 gjabouley-invn,member
 glarsennordic,member
 glenn-andrews,member
@@ -89,6 +111,7 @@ gmarull,member
 golowanow,member
 gramsay0,member
 greg-leach,member
+GTLin08,member
 gzh-terry,member
 HaavardRei,member
 hakehuang,member
@@ -97,22 +120,31 @@ hermabe,member
 HoZHel,member
 hubertmis,member
 ibirnbaum,member
+ifyall,member
 inteljiangwe1,member
+ioannis-karachalios,member
 ithinuel,member
 iuliana-prodan,member
 jackrosenthal,member
+jadonk,member
+jakub-uC,member
 JarmouniA,member
+JasonLin-RealTek,member
 jaz1-nordic,member
 jbehrensnx,member
+jc849,member
 jeppenodgaard,member
 jeremybettis,member
 jerome-pouiller,member
 jfischer-no,member
 jgoppert,member
 jhedberg,member
 JiafeiPan,member
+jilaypandya,member
+jimmyzhe,member
 jonas-rem,member
 JordanYates,member
+josuah,member
 jthm-ot,member
 juimonen,member
 jukkar,member
@@ -126,18 +158,24 @@ keith-packard,member
 keith-zephyr,member
 kevinwang821020,member
 kgugala,member
+KhiemNguyenT,member
+kholia,member
 kkasperczyk-no,member
 kl-cruz,member
 Kludentwo,member
 krish2718,member
+kristofer-jonsson-arm,member
 kv2019i,member
+kwd-doodling,member
 KyraLengfeld,member
 Laczen,member
 larsgk,member
 laurenmurphyx64,member
+LaurentiuM1234,member
 lgirdwood,member
 likongintel,member
 LingaoM,member
+lixuzha,member
 lmajewski,member
 loicpoulain,member
 lorc,member
@@ -146,17 +184,20 @@ luca-fancellu,member
 LucasTambor,member
 LukaszMrugala,member
 lyakh,member
+lylezhu2012,member
 M1cha,member
 maass-hamburg,member
 maciejbaczmanski,member
 magp-nordic,member
+mah-eiSmart,member
 makeshi,member
 Mani-Sadhasivam,member
 manuargue,member
 MaochenWang1,member
 marcinszkudlinski,member
 marekmatej,member
 mariuszpos,member
+MariuszSkamra,member
 MarkWangChinese,member
 Martinhoff-maker,member
 martinjaeger,member
@@ -166,35 +207,44 @@ mateusz-holenko,member
 mathieuchopstm,member
 MaureenHelm,member
 maxd-nordic,member
+maxdog988,member
 mbolivar,member
 mcatee-infineon,member
 mgielda,member
 michalsimek,member
 microbuilder,member
+mmahadevan108,member
 mniestroj,member
 mnkp,member
 mrfuchs,member
 mrkhldn,member
 mrodgers-witekio,member
 msierszulski,member
+MulinChao,member
 najumon1980,member
+nandojve,member
 nashif,maintainer
 nbalabak,member
+ngphibang,member
 nhutnguyenkc,member
+niedzwiecki-dawid,member
 nika-nordic,member
 niym-ot,member
 nordic-auko,member
 nordic-krch,member
 nordicjm,member
 npitre,member
+nzmichaelh,member
 omkar3141,member
 ozersa,member
 parthitce,member
+PavelVPV,member
 pdgendt,member
 pefech,member
 PerMac,member
 peter-mitsis,member
 PetervdPerk-NXP,member
+pideu-sj,member
 pillo79,member
 pin-zephyr,member
 povergoing,member
@@ -205,36 +255,50 @@ raffarost,member
 rajb9,member
 Raymond0225,member
 rbuisson-invn,member
+rerickson1,member
 rettichschnidi,member
 rghaddab,member
 RichardSWheatley,member
 rlubos,member
 RobertZ2011,member
+RobinKastberg,member
+rodrigopex,member
+rriveramcrus,member
 rruuaanng,member
 rugeGerritsen,member
+RuibinChang,member
+ruuddw,member
 sachinthegreen,member
+sambhurst,member
 sateeshkotapati,member
 seov-nordic,member
 SeppoTakalo,member
 SgrrZhf,member
+sidcha,member
 simhein,member
+simonguinot,member
 Sir-Branch,member
 sjanc,member
 sjg20,member
+snematbakhsh,member
 soburi,member
 softwarecki,member
 sreeramIfx,member
 sriccardi-invn,member
 srkanordic,member
 ssekar15,member
 ssharks,member
+StefanHri,member
 stephanosio,maintainer
 str4t0m,member
+swift-tk,member
 swinslow,member
+sylvioalves,member
 tagunil,member
 TaiJuWu,member
 talih0,member
 tbr-tt,member
+tbursztyka,member
 teburd,member
 teikheng,member
 tejlmand,member
@@ -251,6 +315,7 @@ TomChang19,member
 tomi-font,member
 tristan-google,member
 Tronil,member
+tswaehn,member
 ttmut,member
 ubieda,member
 udaynordic,member
@@ -261,6 +326,7 @@ vanti,member
 VenkatKotakonda,member
 Vge0rge,member
 VynDragon,member
+warp5tw,member
 wearyzen,member
 wmrsouza,member
 wopu-ot,member