From c7ca78bafd58964f650dd245d0818de023872e9e Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 7 Jun 2021 12:15:19 +0200
Subject: [PATCH] fix(dashboard): separate pending branch automerge (#10332)
---
.../__fixtures__/master-issue_with_8_PR.txt | 6 ++++++
.../repository/dependency-dashboard.spec.ts | 8 ++++++++
lib/workers/repository/dependency-dashboard.ts | 15 ++++++++++++++-
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/lib/workers/repository/__fixtures__/master-issue_with_8_PR.txt b/lib/workers/repository/__fixtures__/master-issue_with_8_PR.txt
index 5bcb226c2e..f9c831dee8 100644
--- a/lib/workers/repository/__fixtures__/master-issue_with_8_PR.txt
+++ b/lib/workers/repository/__fixtures__/master-issue_with_8_PR.txt
@@ -27,3 +27,9 @@ These updates encountered an error and will be retried. Click a checkbox below t
- [ ] <!-- retry-branch=branchName7 -->pr7
- [ ] <!-- retry-branch=branchName8 -->pr8
+## Pending Branch Automerge
+
+These updates await pending status checks before automerging.
+
+ - [ ] <!-- approvePr-branch=branchName9 -->pr9
+
diff --git a/lib/workers/repository/dependency-dashboard.spec.ts b/lib/workers/repository/dependency-dashboard.spec.ts
index a92c3e32c2..08b611995b 100644
--- a/lib/workers/repository/dependency-dashboard.spec.ts
+++ b/lib/workers/repository/dependency-dashboard.spec.ts
@@ -213,6 +213,14 @@ describe(getName(), () => {
result: BranchResult.Error,
branchName: 'branchName8',
},
+ {
+ ...mock<BranchConfig>(),
+ prTitle: 'pr9',
+ upgrades: [{ ...mock<PrUpgrade>(), depName: 'dep9' }],
+ result: BranchResult.Done,
+ prBlockedBy: 'BranchAutomerge',
+ branchName: 'branchName9',
+ },
];
config.dependencyDashboard = true;
await dependencyDashboard.ensureDependencyDashboard(config, branches);
diff --git a/lib/workers/repository/dependency-dashboard.ts b/lib/workers/repository/dependency-dashboard.ts
index f4ddb1435f..9232176a66 100644
--- a/lib/workers/repository/dependency-dashboard.ts
+++ b/lib/workers/repository/dependency-dashboard.ts
@@ -180,6 +180,17 @@ export async function ensureDependencyDashboard(
}
issueBody += '\n';
}
+ const prPendingBranchAutomerge = branches.filter(
+ (branch) => branch.prBlockedBy === 'BranchAutomerge'
+ );
+ if (prPendingBranchAutomerge.length) {
+ issueBody += '## Pending Branch Automerge\n\n';
+ issueBody += `These updates await pending status checks before automerging.\n\n`;
+ for (const branch of prPendingBranchAutomerge) {
+ issueBody += getListItem(branch, 'approvePr');
+ }
+ issueBody += '\n';
+ }
const otherRes = [
BranchResult.Pending,
BranchResult.NeedsApproval,
@@ -194,7 +205,9 @@ export async function ensureDependencyDashboard(
BranchResult.PrEdited,
];
let inProgress = branches.filter(
- (branch) => !otherRes.includes(branch.result)
+ (branch) =>
+ !otherRes.includes(branch.result) &&
+ branch.prBlockedBy !== 'BranchAutomerge'
);
const otherBranches = inProgress.filter(
(branch) => branch.prBlockedBy || !branch.prNo
--
GitLab