From 85ca58e579c7c41b10bbf3f07153639a486d51d6 Mon Sep 17 00:00:00 2001 From: Yaacov Rydzinski Date: Fri, 27 Feb 2026 11:37:20 +0200 Subject: [PATCH] fix(changelog): adjust end-ref to not skip last PR --- resources/gen-changelog.ts | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/resources/gen-changelog.ts b/resources/gen-changelog.ts index 62d6941bac..74042f269c 100644 --- a/resources/gen-changelog.ts +++ b/resources/gen-changelog.ts @@ -73,17 +73,29 @@ function parseFromRevArg(rawArgs: ReadonlyArray): string | null { async function genChangeLog(): Promise { const { version } = packageJSON; const releaseTag = `v${version}`; + const fromRev = parseFromRevArg(process.argv.slice(2)); const releaseTagExists = git().tagExists(releaseTag); - const tag = releaseTagExists ? null : releaseTag; - let baseRef = parseFromRevArg(process.argv.slice(2)); + + let tag: string | null; + let baseRef: string; + let endRef: string; if (releaseTagExists) { - baseRef ??= releaseTag; - } else if (baseRef == null) { - const parentPackageJSON = git().catFile('blob', 'HEAD~1:package.json'); - const parentVersion = JSON.parse(parentPackageJSON).version; - baseRef = `v${parentVersion}`; + tag = null; + baseRef = fromRev ?? releaseTag; + endRef = 'HEAD'; + } else { + tag = releaseTag; + if (fromRev != null) { + baseRef = fromRev; + } else { + const parentPackageJSON = git().catFile('blob', 'HEAD~1:package.json'); + const parentVersion = JSON.parse(parentPackageJSON).version; + baseRef = `v${parentVersion}`; + } + endRef = 'HEAD~1'; } - const commitsRange = releaseTagExists ? `${baseRef}..` : `${baseRef}..HEAD~1`; + + const commitsRange = `${baseRef}..${endRef}`; const commitsList = git().revList('--reverse', commitsRange); const allPRs = await getPRsInfo(commitsList);