Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions .github/actions/release-pr-bot/manage-release-pr.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,27 @@ async function updateReleasePR({ github, owner, repo, pr, body, reviewers }) {

await github.rest.pulls.update({ owner, repo, pull_number: pr.number, body })

const { data: currentReviews } =
await github.rest.pulls.listRequestedReviewers({
owner,
repo,
pull_number: pr.number,
})

const currentLogins = new Set(currentReviews.users.map((u) => u.login))
const newReviewers = reviewers.filter((r) => !currentLogins.has(r))
const [{ data: currentReviews }, { data: submittedReviews }] =
await Promise.all([
github.rest.pulls.listRequestedReviewers({
owner,
repo,
pull_number: pr.number,
}),
github.rest.pulls.listReviews({
owner,
repo,
pull_number: pr.number,
}),
])

const excludedLogins = new Set([
...currentReviews.users.map((u) => u.login),
...submittedReviews
.filter((review) => review.state === 'APPROVED')
.map((review) => review.user?.login),
])
const newReviewers = reviewers.filter((r) => !excludedLogins.has(r))

if (newReviewers.length > 0) {
await github.rest.pulls.requestReviewers({
Expand Down
16 changes: 16 additions & 0 deletions .github/actions/release-pr-bot/manage-release-pr.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const makeGithub = ({
mergedPRs = [],
openPRs = [],
currentReviewers = [],
submittedReviews = [],
} = {}) => ({
rest: {
repos: {
Expand All @@ -17,6 +18,7 @@ const makeGithub = ({
create: jest.fn().mockResolvedValue({ data: { number: 99, html_url: 'https://github.com/test/pull/99' } }),
update: jest.fn().mockResolvedValue({}),
listRequestedReviewers: jest.fn().mockResolvedValue({ data: { users: currentReviewers } }),
listReviews: jest.fn().mockResolvedValue({ data: submittedReviews }),
requestReviewers: jest.fn().mockResolvedValue({}),
},
},
Expand Down Expand Up @@ -92,6 +94,20 @@ describe('manage-release-pr', () => {
expect(github.rest.pulls.requestReviewers).not.toHaveBeenCalled()
})

it('does not re-request reviews from people who already approved', async () => {
const github = makeGithub({
commits: [{ sha: 'abc123' }],
mergedPRs: [unreleasedPR],
openPRs: [{ number: 42 }],
currentReviewers: [],
submittedReviews: [{ user: { login: 'alice' }, state: 'APPROVED' }],
})

await run({ github, context: makeContext() })

expect(github.rest.pulls.requestReviewers).not.toHaveBeenCalled()
})

it('excludes bots from reviewers', async () => {
const github = makeGithub({
commits: [{ sha: 'abc123' }],
Expand Down
Loading