From 0b743a9583977722bfd527018a9251f4c3d6b3e2 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Sat, 22 May 2021 11:25:59 +0200
Subject: [PATCH] fix: filter pendingChecks earlier
---
lib/workers/repository/updates/generate.ts | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/lib/workers/repository/updates/generate.ts b/lib/workers/repository/updates/generate.ts
index 548cec59f9..e7e9d2b3ad 100644
--- a/lib/workers/repository/updates/generate.ts
+++ b/lib/workers/repository/updates/generate.ts
@@ -55,8 +55,13 @@ function getTableValues(
}
export function generateBranchConfig(
- branchUpgrades: BranchUpgradeConfig[]
+ upgrades: BranchUpgradeConfig[]
): BranchConfig {
+ let branchUpgrades = upgrades;
+ if (!branchUpgrades.every((upgrade) => upgrade.pendingChecks)) {
+ // If the branch isn't pending, then remove any upgrades within which *are*
+ branchUpgrades = branchUpgrades.filter((upgrade) => !upgrade.pendingChecks);
+ }
logger.trace({ config: branchUpgrades }, 'generateBranchConfig');
let config: BranchConfig = {
upgrades: [],
@@ -306,14 +311,6 @@ export function generateBranchConfig(
config.constraints = { ...config.constraints, ...upgrade.constraints };
}
}
- if (!config.upgrades?.every((upgrade) => upgrade.pendingChecks)) {
- // A branch should only have pendingChecks if all upgrades have pendingChecks
- delete config.pendingChecks;
- // If the branch isn't pending, then remove any upgrades within which *are*
- config.upgrades = config.upgrades.filter(
- (upgrade) => !upgrade.pendingChecks
- );
- }
const tableRows = config.upgrades
.map((upgrade) => getTableValues(upgrade))
.filter(Boolean);
--
GitLab