renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-14 16:46:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix(github): try automerge PR even if approving reviews required (#21883)

Browse source
This commit is contained in:
Rhys Arkins 2023-04-29 10:55:52 +02:00 committed by GitHub
parent ab04c11f42
commit 91cbe5bdcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/modules/platform/github/index.spec.ts
View file

@ -2839,6 +2839,28 @@ describe('modules/platform/github/index', () => {
})
).toBeFalse();
});
it('should handle approvers required', async () => {
const scope = httpMock.scope(githubApiHost);
initRepoMock(scope, 'some/repo');
scope.put('/repos/some/repo/pulls/1234/merge').reply(405, {
message:
'At least 1 approving review is required by reviewers with write access.',
});
await github.initRepo({ repository: 'some/repo' });
const pr = {
number: 1234,
head: {
ref: 'someref',
},
};
expect(
await github.mergePr({
branchName: '',
id: pr.number,
})
).toBeFalse();
});
});
describe('massageMarkdown(input)', () => {

41
lib/modules/platform/github/index.ts
View file

@ -593,15 +593,6 @@ export async function getRepoForceRebase(): Promise<boolean> {
config.repoForceRebase = false;
const branchProtection = await getBranchProtection(config.defaultBranch);
logger.debug('Found branch protection');
if (
branchProtection.required_pull_request_reviews
?.required_approving_review_count > 0
) {
logger.debug(
'Branch protection: PR Reviews are required before merging'
);
config.prReviewsRequired = true;
}
if (branchProtection.required_status_checks) {
if (branchProtection.required_status_checks.strict) {
logger.debug(
@ -1606,28 +1597,6 @@ export async function mergePr({
id: prNo,
}: MergePRConfig): Promise<boolean> {
logger.debug(`mergePr(${prNo}, ${branchName})`);
// istanbul ignore if
if (config.prReviewsRequired) {
logger.debug(
{ branch: branchName, prNo },
'Branch protection: Attempting to merge PR when PR reviews are enabled'
);
const repository = config.parentRepo ?? config.repository;
const reviews = await githubApi.getJson<{ state: string }[]>(
`repos/${repository}/pulls/${prNo}/reviews`
);
const isApproved = reviews.body.some(
(review) => review.state === 'APPROVED'
);
if (!isApproved) {
logger.debug(
{ branch: branchName, prNo },
'Branch protection: Cannot automerge PR until there is an approving review'
);
return false;
}
logger.debug('Found approving reviews');
}
const url = `repos/${
config.parentRepo ?? config.repository
}/pulls/${prNo}/merge`;
@ -1660,6 +1629,16 @@ export async function mergePr({
);
return false;
}
if (
is.nonEmptyString(body?.message) &&
body.message.includes('approving review')
) {
logger.debug(
{ response: body },
`GitHub blocking PR merge -- Needs approving review(s)`
);
return false;
}
logger.debug(
{ response: body },
'GitHub blocking PR merge -- will keep trying'