miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

fix(release): ensure tags for version match stable variant before prerelease (#30047)

Browse Source
This commit is contained in:
James Henry 2025-02-14 20:08:34 +04:00 committed by GitHub
parent 2413a4393c
commit 888957a010
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
e2e/release/src/release-tag-pattern.test.ts
View File

@ -57,6 +57,36 @@ describe('nx release releaseTagPattern', () => {
afterEach(() => cleanupProject());
it('should prefer stable versions over prereleases', async () => {
updateJson<NxJsonConfiguration>('nx.json', (nxJson) => {
nxJson.release = {
releaseTagPattern: 'v{version}',
version: {
conventionalCommits: true,
},
};
return nxJson;
});
// Tag the existing commit as a prerelease
await runCommandAsync(`git tag -a v1.0.0-beta.1 -m "v1.0.0-beta.1"`);
// Resolve that prerelease as the current version
expect(runCLI(`release version -d`)).toContain(
`Resolved the current version as 1.0.0-beta.1 from git tag "v1.0.0-beta.1"`
);
// Make a new commit and tag it as a stable version
await runCommandAsync(`echo "Hello" > README.md`);
await runCommandAsync(`git add README.md`);
await runCommandAsync(`git commit -m "chore: update README.md"`);
await runCommandAsync(`git tag -a v1.0.0 -m "v1.0.0"`);
expect(runCLI(`release version -d`)).toContain(
`Resolved the current version as 1.0.0 from git tag "v1.0.0"`
);
});
describe('releaseTagPatternCheckAllBranchesWhen', () => {
it('should check the current branch first, and then fall back to all branches by default/when not specified', async () => {
updateJson<NxJsonConfiguration>('nx.json', (nxJson) => {

9
packages/nx/src/command-line/release/utils/git.ts
View File

@ -85,7 +85,14 @@ export async function getLatestGitTagForPattern(
}
}
const defaultGitArgs = ['tag', '--sort', '-v:refname'];
const defaultGitArgs = [
// Apply git config to take version suffixes into account when sorting, e.g. 1.0.0 is newer than 1.0.0-beta.1
'-c',
'versionsort.suffix=-',
'tag',
'--sort',
'-v:refname',
];
try {
let tags: string[];