From dd4b97df95573e1ed944759e578c31bb1d7ba616 Mon Sep 17 00:00:00 2001
From: Mike Bryant <mike@mikebryant.me.uk>
Date: Sat, 30 May 2020 11:03:25 +0100
Subject: [PATCH] fix(internal): Generate logJSON before commit body is
templated (#6346)
Co-authored-by: Rhys Arkins <rhys@arkins.net>
---
lib/workers/repository/changelog/index.ts | 9 ++++++---
lib/workers/repository/index.ts | 3 ---
lib/workers/repository/updates/branchify.ts | 2 ++
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lib/workers/repository/changelog/index.ts b/lib/workers/repository/changelog/index.ts
index 9a5babdff7..773ef38860 100644
--- a/lib/workers/repository/changelog/index.ts
+++ b/lib/workers/repository/changelog/index.ts
@@ -1,4 +1,5 @@
import pMap from 'p-map';
+import { BranchUpgradeConfig } from '../../common';
import { getChangeLogJSON } from '../../pr/changelog';
// istanbul ignore next
@@ -7,10 +8,12 @@ async function embedChangelog(upgrade): Promise<void> {
}
// istanbul ignore next
-export async function embedChangelogs(branches): Promise<void> {
+export async function embedChangelogs(
+ branchUpgrades: Record<string, BranchUpgradeConfig[]>
+): Promise<void> {
const upgrades = [];
- for (const branch of branches) {
- for (const upgrade of branch.upgrades) {
+ for (const branchName of Object.keys(branchUpgrades)) {
+ for (const upgrade of branchUpgrades[branchName]) {
upgrades.push(upgrade);
}
}
diff --git a/lib/workers/repository/index.ts b/lib/workers/repository/index.ts
index 1459bc3ff2..da3ef08408 100644
--- a/lib/workers/repository/index.ts
+++ b/lib/workers/repository/index.ts
@@ -3,7 +3,6 @@ import { RenovateConfig } from '../../config';
import { logger, setMeta } from '../../logger';
import { platform } from '../../platform';
import { addSplit, getSplits, splitInit } from '../../util/split';
-import { embedChangelogs } from './changelog';
import handleError from './error';
import { finaliseRepo } from './finalise';
import { initRepo } from './init';
@@ -38,8 +37,6 @@ export async function renovateRepository(
config
);
await ensureOnboardingPr(config, packageFiles, branches);
- await embedChangelogs(branches);
- addSplit('changelogs');
const res = await updateRepo(config, branches, branchList);
addSplit('update');
if (res !== 'automerged') {
diff --git a/lib/workers/repository/updates/branchify.ts b/lib/workers/repository/updates/branchify.ts
index e2aa1903d0..0b3409b7d1 100644
--- a/lib/workers/repository/updates/branchify.ts
+++ b/lib/workers/repository/updates/branchify.ts
@@ -4,6 +4,7 @@ import { RenovateConfig, ValidationMessage } from '../../../config';
import { addMeta, logger, removeMeta } from '../../../logger';
import * as template from '../../../util/template';
import { BranchConfig, BranchUpgradeConfig } from '../../common';
+import { embedChangelogs } from '../changelog';
import { flattenUpdates } from './flatten';
import { generateBranchConfig } from './generate';
import { Merge } from 'type-fest';
@@ -109,6 +110,7 @@ export async function branchifyUpgrades(
);
}
logger.debug(`Returning ${Object.keys(branchUpgrades).length} branch(es)`);
+ await embedChangelogs(branchUpgrades);
for (const branchName of Object.keys(branchUpgrades)) {
// Add branch name to metadata before generating branch config
addMeta({
--
GitLab