From 855ed50033be17ec8c824d30912fafc4f8b76d70 Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Mon, 17 Sep 2018 11:53:02 +0200 Subject: [PATCH] fix(changelog): use resolved filename Closes #2529 --- lib/workers/pr/changelog/release-notes.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/workers/pr/changelog/release-notes.js b/lib/workers/pr/changelog/release-notes.js index 11d1873e80..f26911e058 100644 --- a/lib/workers/pr/changelog/release-notes.js +++ b/lib/workers/pr/changelog/release-notes.js @@ -111,6 +111,7 @@ function sectionize(text, level) { async function getReleaseNotesMd(repository, version, githubBaseURL) { logger.trace(`getReleaseNotes(${repository}, ${version})`); + let changelogFile; let changelogMd = ''; try { let apiPrefix = githubBaseURL @@ -125,12 +126,14 @@ async function getReleaseNotesMd(repository, version, githubBaseURL) { logger.trace('no changelog file found'); return null; } - const file = files[0]; + [changelogFile] = files; /* istanbul ignore if */ if (files.length > 1) { - logger.info(`Multiple candidates for changelog file, using ${file}`); + logger.info( + `Multiple candidates for changelog file, using ${changelogFile}` + ); } - const fileRes = await ghGot(`${apiPrefix}/${file}`); + const fileRes = await ghGot(`${apiPrefix}/${changelogFile}`); changelogMd = Buffer.from(fileRes.body.content, 'base64').toString() + '\n#\n##'; } catch (err) { @@ -153,7 +156,7 @@ async function getReleaseNotesMd(repository, version, githubBaseURL) { for (const word of title) { if (word.includes(version)) { logger.trace({ body }, 'Found release notes for v' + version); - let url = `${githubBaseURL}${repository}/blob/master/CHANGELOG.md#`; + let url = `${githubBaseURL}${repository}/blob/master/${changelogFile}#`; url += title.join('-').replace(/[^A-Za-z0-9-]/g, ''); body = massageBody(body, githubBaseURL); if (body && body.length) { @@ -172,13 +175,13 @@ async function getReleaseNotesMd(repository, version, githubBaseURL) { } } } catch (err) /* istanbul ignore next */ { - logger.warn({ err }, 'Error parsing CHANGELOG.md'); + logger.warn({ err }, `Error parsing ${changelogFile}`); } } } logger.trace({ repository }, `No level ${level} changelogs headings found`); } - logger.trace({ repository, version }, 'No entry found in CHANGELOG.md'); + logger.trace({ repository, version }, `No entry found in ${changelogFile}`); return null; } -- GitLab