From 004d548768be8ee5e3873a888cf1f12e549a05af Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 18 May 2026 17:25:58 -0400
Subject: [PATCH] Revert "ci/github-script/reviewers: keep team members when
 revoking stale requests"

This reverts commit b721b82180ec6f975c65e6efaab574df24416a33.

(cherry picked from commit acb7b7a38cc4706a0275f7dfefd9452d52a8652a)
---
 ci/github-script/bot.js       |  1 -
 ci/github-script/reviewers.js | 22 +---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index d7602c627977..0fa2851ff38b 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -494,7 +494,6 @@ module.exports = async ({ github, context, core, dry }) => {
           owners,
           getUser,
           getTeam,
-          getTeamMembers,
         })
       }
     }
diff --git a/ci/github-script/reviewers.js b/ci/github-script/reviewers.js
index 41b9f9228536..6fc6ede00f96 100644
--- a/ci/github-script/reviewers.js
+++ b/ci/github-script/reviewers.js
@@ -12,7 +12,6 @@ async function handleReviewers({
   owners,
   getUser,
   getTeam,
-  getTeamMembers,
 }) {
   const pull_number = pull_request.number
 
@@ -159,25 +158,6 @@ async function handleReviewers({
   )
   log('reviewers - teams_not_yet_reached', teams_not_yet_reached.join(', '))
 
-  // Also keep members of teams_to_reach: GitHub's per-team code-review-assignment
-  // can turn a team request into individual bot-attributed adds.
-  const team_member_logins = new Set(
-    (
-      await Promise.all(
-        Array.from(teams_to_reach, async (slug) => {
-          const ms = await getTeamMembers(slug)
-          return ms.map(({ login }) => login.toLowerCase())
-        }),
-      )
-    ).flat(),
-  )
-  log(
-    'reviewers - team_member_logins',
-    Array.from(team_member_logins).join(', '),
-  )
-
-  const users_to_keep = users_to_reach.union(team_member_logins)
-
   // The usernames of bots that make review requests we may auto-revoke.
   const revokable_requesters = ['github-actions[bot]', 'nixpkgs-ci[bot]']
 
@@ -203,7 +183,7 @@ async function handleReviewers({
   // Pending requests no longer in the to_reach set, excluding the engaged
   // and anything not requested by our own bot.
   const users_to_remove = Array.from(
-    pending_users.difference(users_to_keep).difference(users_engaged),
+    pending_users.difference(users_to_reach).difference(users_engaged),
   ).filter((login) =>
     revokable_requesters.includes(last_request_actor_for_user.get(login)),
   )