Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(release): only early exit when no changelog changes if expecting commit #20568

Merged
merged 4 commits into from
Dec 5, 2023
Merged

fix(release): only early exit when no changelog changes if expecting commit #20568

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f757397
fix(release): only early exit when no changelog changes if expecting …
JamesHenry Dec 4, 2023
00c2bdf
fix(release): update fix
JamesHenry Dec 4, 2023
f4d34ca
Merge branch 'master' into changelog-fix
JamesHenry Dec 5, 2023
5d465da
Merge branch 'master' into changelog-fix
JamesHenry Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 23 additions & 2 deletions packages/nx/src/command-line/release/changelog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,14 @@ async function applyChangesAndExit(
let latestCommit = toSHA;

const changes = tree.listChanges();
// This could happen we using conventional commits, for example
if (!changes.length) {

/**
* In the case where we are expecting changelog file updates, but there is nothing
* to flush from the tree, we exit early. This could happen we using conventional
* commits, for example.
*/
const changelogFilesEnabled = checkChangelogFilesEnabled(nxReleaseConfig);
if (changelogFilesEnabled && !changes.length) {
output.warn({
title: `No changes detected for changelogs`,
bodyLines: [
Expand Down Expand Up @@ -897,3 +903,18 @@ async function generateChangelogForProjects(
printSummary();
}
}

function checkChangelogFilesEnabled(nxReleaseConfig: NxReleaseConfig): boolean {
if (
nxReleaseConfig.changelog.workspaceChangelog &&
nxReleaseConfig.changelog.workspaceChangelog.file
) {
return true;
}
for (const releaseGroup of Object.values(nxReleaseConfig.groups)) {
if (releaseGroup.changelog && releaseGroup.changelog.file) {
return true;
}
}
return false;
}