Sync organization members by emilyalbini · Pull Request #1868 · rust-lang/team

emilyalbini · 2025-06-04T09:13:39Z

Re-submitting #1866 again as requested:

This PR finishes the work from rust-lang/sync-team#91 (I used @me-diru's code, adapted it to the modified codebase and marked them as an author).

I guess that it would be good to repost this PR by an infra-admin, so that we could get a dry-run for it.

Fixes: #1731

cc @Kobzol

Reach out to people that we are removing to thank them for their work and explain why we are removing them

Discussed in #t-infra > removing inactive members from the org.

github-actions · 2025-06-04T09:21:25Z

Dry-run check results


[WARN  sync_team] sync-team is running in dry mode, no changes will be applied.
[INFO  sync_team] synchronizing github
[INFO  sync_team] 💻 Org membership Diffs:
    ❌ Removing the following members from `rust-analyzer`:
      - JoshMcguigan
      - SomeoneToIgnore
      - Veetaha
      - Xanewok
      - dustypomerleau
      - edwin0cheng
      - kiljacken
      - kjeremy
      - lf-
      - lowr
      - matklad
      - pnkfelix
      - wesleywiser
    ❌ Removing the following members from `rust-dev-tools`:
      - QuietMisdreavus
      - Xanewok
      - fitzgen
      - killercup
      - kinnison
      - nrc
      - tromey
    ❌ Removing the following members from `rust-lang`:
      - Aaron1011
      - Aatch
      - AlexEne
      - AngelOnFira
      - Azhng
      - AzureMarker
      - BenLewis-Seequent
      - ChrisPardy
      - CraftSpider
      - CryZe
      - Dajamante
      - Diggsey
      - Gankra
      - GeertVL-zz
      - Haggus
      - Havvy
      - JDuchniewicz
      - JamesPatrickGill
      - JoeyEremondi
      - JuanPotato
      - KiChjang
      - Kimundi
      - Kixiron
      - LeSeulArtichaut
      - Lubits
      - LucasBullen
      - LucioFranco
      - LukasKalbertodt
      - MarkMcCaskey
      - Nashenas88
      - NikVolf
      - PartiallyUntyped
      - PramodBisht
      - QuietMisdreavus
      - SomeoneToIgnore
      - Stupremee
      - TimNN
      - XAMPPRocky
      - Xanewok
      - Xylakant
      - aatxe
      - adamgreig
      - adrq
      - aidanhs
      - alexheretic
      - am-1t
      - amanjeev
      - andre-richter
      - anp
      - aravind-pg
      - arazabishov
      - arielb1
      - arora-aman
      - ashleygwilliams
      - aturon
      - autodidaddict
      - autozimu
      - avadacatavra
      - bIgBV
      - basil-cow
      - bawerd
      - bennyvasquez
      - betamos
      - blitzerr
      - bluss
      - booyaa
      - brendanzab
      - camsteffen
      - carllerche
      - championshuttler
      - chrissimpkins
      - chrisvittal
      - comex
      - csmoe
      - davidlattimore
      - detrumi
      - dhuseby
      - dirtybit
      - djcarpe
      - doc-jones
      - dotdash
      - dwijnand
      - dyxushuai
      - ebroto
      - edunham
      - edwin0cheng
      - ehsanmok
      - eldruin
      - emberian
      - eminence
      - emmanuelantony2000
      - erickt
      - fairingrey
      - flaper87
      - fmckeogh
      - frewsxcv
      - gaurikholkar-zz
      - gavento
      - gereeter
      - giannicic
      - gilescope
      - glandium
      - gnunicorn
      - gsollazzo
      - h1467792822
      - hameerabbasi
      - hargoniX
      - hdhoang
      - hkmatsumoto
      - hrvolapeter
      - hsivonen
      - huonw
      - igaray
      - inquisitivecrystal
      - ishitatsuyuki
      - japaric
      - jasonwilliams
      - jdm
      - jechasteen
      - jenniferwills
      - jkelleyrtp
      - jkordish
      - jonathanpallant
      - jroesch
      - jrozner
      - jseyfried
      - justahero
      - khaledkbadr
      - khionu
      - killercup
      - kinnison
      - korken89
      - koute
      - kupiakos
      - kvark
      - lbernick
      - leoyvens
      - lilyball
      - listochkin
      - lloydmeta
      - locks
      - logmosier
      - lowr
      - luqmana
      - mark-i-m
      - matklad
      - matthieu-m
      - mbrubeck
      - mcarton
      - memoryruins
      - mikhail-m1
      - mstallmo
      - mystor
      - nagashi
      - nasa42
      - nathanwhit
      - nbp
      - nikomatsakis-admin
      - nox
      - null-sleep
      - o0Ignition0o
      - ollie27
      - onur
      - onur-ozkan
      - orenwf
      - orium
      - ouz-a
      - pambihira
      - pcwalton
      - pepyakin
      - peschkaj
      - phansch
      - pichfl
      - pierwill
      - pnkfelix
      - qmx
      - retep998
      - rfcbot
      - rholderfield
      - ritiek
      - roxelo
      - rust-heroku-deploy-access
      - ryankurte
      - sanxiyn
      - sapphire-arches
      - scalexm
      - scampi
      - seanchen1991
      - sgrif
      - smarnach
      - solson
      - soniasingla
      - steveklabnik
      - stokhos
      - strega-nil
      - sunjay
      - tamuhey
      - tgnottingham
      - thejpster
      - therealprof
      - togiberlin
      - tomprince
      - topecongiro
      - totsteps
      - treiff
      - uberjay
      - vadimcn
      - valgrimm
      - varkor
      - vlad20012
      - wain303009
      - whitequark
      - wirelessringo
      - withoutboats
      - wycats
      - xFrednet
      - xmonader
      - zackmdavis
      - zaharidichev
      - zeenix
    ❌ Removing the following members from `rust-lang-nursery`:
      - ALCC01
      - Aaron1011
      - AzureMarker
      - BenLewis-Seequent
      - Byron
      - CraftSpider
      - Diggsey
      - ELD
      - Gankra
      - Haggus
      - JoeyEremondi
      - KiChjang
      - Kimundi
      - Kixiron
      - LeSeulArtichaut
      - LucioFranco
      - LukasKalbertodt
      - MajorBreakfast
      - MarkMcCaskey
      - Michael-F-Bryan
      - Nashenas88
      - PramodBisht
      - QuietMisdreavus
      - TimNN
      - Xanewok
      - Yarn
      - aajtodd
      - aatxe
      - aidanhs
      - alecmocatta
      - alexheretic
      - andrewtj
      - anxiousmodernman
      - aravind-pg
      - ashfordneil
      - ashleygwilliams
      - aturon
      - autodidaddict
      - autozimu
      - avadacatavra
      - azdle
      - bIgBV
      - badboy
      - basil-cow
      - betamos
      - calebcartwright
      - carols10cents
      - cassiersg
      - chrisvittal
      - csmoe
      - davidbarsky
      - deg4uss3r
      - detrumi
      - dibsonmuad
      - doc-jones
      - ecstatic-morse
      - eddyb
      - edunham
      - eminence
      - emmanuelantony2000
      - ereichert
      - erickt
      - fitzgen
      - gaurikholkar-zz
      - gavento
      - giannicic
      - gilescope
      - gnzlbg
      - gruberb
      - hrvolapeter
      - huonw
      - ibabushkin
      - inejge
      - ishitatsuyuki
      - japaric
      - jasonwilliams
      - jbcden
      - jethrogb
      - jkozlowski
      - jonathanpallant
      - jyn514
      - khaledkbadr
      - khionu
      - killercup
      - kinnison
      - kleimkuhler
      - kulshrax
      - lbernick
      - leoyvens
      - levex
      - llogiq
      - lloydmeta
      - marcusklaas
      - matklad
      - matthieu-m
      - mbrubeck
      - michaelwoerister
      - mitsuhiko
      - nathanwhit
      - nellshamrell
      - nikomatsakis-admin
      - ollie27
      - onur
      - orenwf
      - pnkfelix
      - qmx
      - ritiek
      - rolftimmermans
      - rylev
      - sapphire-arches
      - scalexm
      - sfackler
      - sgrif
      - solson
      - steveklabnik
      - strega-nil
      - sunjay
      - technetos
      - tinaun
      - tomaka
      - tomprince
      - topecongiro
      - tromey
      - tynril
      - varkor
      - vlad20012
      - withoutboats
      - xmonader
      - zackmdavis
      - zaharidichev
      - zeenix

marcoieni · 2025-06-04T12:08:07Z

It's removing rust-lang-owner and other bots

marcoieni · 2025-07-15T07:01:46Z

I tried pushing one commit that also updated master, but failed miserably, so I reverted it 😅

marcoieni · 2025-07-15T07:07:47Z

Now Kobzol is not in the authors of the commit anymore. Sorry about that but that's the maximum I can get with my git skills 😂

sync-team/src/github/mod.rs

config.toml

Kobzol · 2025-07-15T15:25:02Z

config.toml

+
+# GitHub accounts that are allowed to stay in the orgs,
+# even if they may not be members of any team.
+allowed-org-members = [


nit: allowed makes it sound like only these org members may be a part of an org :D Which of course doesn't make sense, and the comment does clarify it. But I don't have a great alternative. Maybe just special-org-members? But it doesn't really matter.

I like special-org-members

Special also doesn't clarify much, maybe call it dont-remove-from-orgs = []?

Kobzol · 2025-07-15T15:26:06Z

config.toml

+    "rustbot",
+
+    # Infra admins.
+    "jdno",


Hmm, we start having a bunch of places where we hardcode infra-admins. Maybe it would be better if we loaded the actual contents of the infra-admins team (so that we hardcode only the team in code, but not its members) in code and ignored them?

This is a good point, but also, I'm not sure if hardcoding the infra-admins team in the code is the best either. As we are not managing org owners with the team repo for now, I'd skip removing any org owner, and do a manual pass removing inactive org owners.

We already hardcode infra-admins for CODEOWNERS, but ignoring org owners is a good point.

Kobzol · 2025-07-15T15:27:35Z

rust_team_data/src/v1.rs


 pub static BASE_URL: &str = "https://team-api.infra.rust-lang.org/v1";

+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]


I don't think we need to expose this to the JSON API? It's an internal implementation detail. Can't you just pass &Config from team to sync-team in run_sync_team?

marcoieni · 2025-07-17T14:11:26Z

addressed the feedback, thanks. Ready for another look 👍

config.toml

Kobzol

Looks good, thanks!

jieyouxu · 2025-08-08T13:34:48Z

Triage: waiting on the communication part #t-infra > removing inactive members from the org.

programmerjake · 2025-08-12T11:52:57Z

Now Kobzol is not in the authors of the commit anymore. Sorry about that but that's the maximum I can get with my git skills 😂

if you want more than one author to be listed, you can use Co-Authored-By: Their Name <their@email.example.com>

emilyalbini requested review from Mark-Simulacrum, jdno and marcoieni as code owners June 4, 2025 09:13

marcoieni force-pushed the sync-org-members branch from 1bbac75 to b8049db Compare July 15, 2025 07:00

marcoieni force-pushed the sync-org-members branch from b8049db to 3e935a6 Compare July 15, 2025 07:06

marcoieni force-pushed the sync-org-members branch 2 times, most recently from ebdec80 to e05929e Compare July 15, 2025 07:42

samueltardieu reviewed Jul 15, 2025

View reviewed changes

sync-team/src/github/mod.rs Outdated Show resolved Hide resolved

marcoieni force-pushed the sync-org-members branch 2 times, most recently from b8a431b to c9d7993 Compare July 15, 2025 08:18

tshepang reviewed Jul 15, 2025

View reviewed changes

config.toml Outdated Show resolved Hide resolved

marcoieni force-pushed the sync-org-members branch 2 times, most recently from e76e204 to 6a05230 Compare July 15, 2025 08:57

Kobzol reviewed Jul 15, 2025

View reviewed changes

marcoieni force-pushed the sync-org-members branch 4 times, most recently from 8e30e03 to 651601f Compare July 17, 2025 13:40

marcoieni requested a review from Kobzol July 17, 2025 14:00

fmease reviewed Jul 17, 2025

View reviewed changes

config.toml Show resolved Hide resolved

marcoieni force-pushed the sync-org-members branch 2 times, most recently from 8fd1430 to 2492b40 Compare July 17, 2025 15:52

emilyalbini commented Jul 17, 2025

View reviewed changes

config.toml Outdated Show resolved Hide resolved

marcoieni force-pushed the sync-org-members branch from 2492b40 to 91501b9 Compare July 18, 2025 08:48

Kobzol approved these changes Jul 24, 2025

View reviewed changes

fmease mentioned this pull request Aug 4, 2025

Add rustdoc team processes rust-lang/rust-forge#852

Merged

jieyouxu added needs-infra-admin-review This change requires one of the `infra-admins` to review. S-waiting-on-team Status: waiting on team T-infra Relevant to the infrastructure team. labels Aug 8, 2025

marcoieni mentioned this pull request Aug 12, 2025

Announce members removal rust-lang/blog.rust-lang.org#1677

Merged

marcoieni mentioned this pull request Aug 14, 2025

Show archived teams in the website rust-lang/www.rust-lang.org#2181

Closed

me-diru and others added 2 commits August 26, 2025 10:54

Sync organization members

e9649a8

add org members allow list

78a61b8

marcoieni force-pushed the sync-org-members branch from 91501b9 to 78a61b8 Compare August 26, 2025 08:55

marcoieni approved these changes Aug 26, 2025

View reviewed changes

marcoieni added this pull request to the merge queue Aug 26, 2025

Merged via the queue into master with commit ef09805 Aug 26, 2025
3 checks passed


		pub static BASE_URL: &str = "https://team-api.infra.rust-lang.org/v1";

		#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]

Conversation

emilyalbini commented Jun 4, 2025 • edited by marcoieni Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jun 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marcoieni commented Jun 4, 2025

Uh oh!

marcoieni commented Jul 15, 2025

Uh oh!

marcoieni commented Jul 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Kobzol Jul 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tshepang Jul 15, 2025

Choose a reason for hiding this comment

Uh oh!

emilyalbini Jul 17, 2025

Choose a reason for hiding this comment

Uh oh!

Kobzol Jul 15, 2025

Choose a reason for hiding this comment

Uh oh!

emilyalbini Jul 17, 2025

Choose a reason for hiding this comment

Uh oh!

Kobzol Jul 17, 2025

Choose a reason for hiding this comment

Uh oh!

Kobzol Jul 15, 2025

Choose a reason for hiding this comment

Uh oh!

marcoieni commented Jul 17, 2025

Uh oh!

Uh oh!

Uh oh!

Kobzol left a comment

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Aug 8, 2025

Uh oh!

programmerjake commented Aug 12, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

emilyalbini commented Jun 4, 2025 •

edited by marcoieni

Loading

github-actions bot commented Jun 4, 2025 •

edited

Loading

marcoieni commented Jul 15, 2025 •

edited

Loading

Kobzol Jul 15, 2025 •

edited

Loading