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.

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

fix: next version calculation for tags that contain a name/prefix #2436

Merged
merged 4 commits into from
Feb 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions packages/core/src/__tests__/release.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,31 @@ describe("Release", () => {
expect(writeSpy.mock.calls[0][1].includes(`1.0.1`)).toBe(true);
});

test("creates changelog with named tag and version prefix", async () => {
const gh = new Release(git, {
noVersionPrefix: false,
prereleaseBranches: ["next"],
labels: defaultLabels,
baseBranch: "main",
});
await gh.addToChangelog("# My new Notes", "my-tag-name-v1.0.0", "v1.0.0");

expect(writeSpy.mock.calls[0][1].includes(`v1.0.1`)).toBe(true);
});

test("creates changelog with named tag", async () => {
const gh = new Release(git, {
noVersionPrefix: true,
prereleaseBranches: ["next"],
labels: defaultLabels,
baseBranch: "main",
});
await gh.addToChangelog("# My new Notes", "my-tag-name-1.0.0", "1.0.0");

expect(writeSpy.mock.calls[0][1].includes(`1.0.1`)).toBe(true);
});


test("prepends to old changelog", async () => {
const gh = new Release(git, config);

Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/release.ts
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,9 @@ export default class Release {
/** Given a tag get the next incremented version */
async calcNextVersion(lastTag: string) {
const bump = await this.getSemverBump(lastTag);
return inc(lastTag, bump as ReleaseType);
const matches = lastTag.match(/(\d+\.\d+\.\d+)/)
const lastVersion = matches ? matches[0] : lastTag
return inc(lastVersion, bump as ReleaseType);
}

/** Create the class that will parse the log for PR info */
Expand Down
Loading