Skip to content

Commit 60f0bf9

Browse files
authored
fix(repo): ensure canary releases include all packages with consistent versions (#7439)
1 parent 93d568f commit 60f0bf9

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

packages/shared/src/__tests__/versionSelector.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ describe('versionSelector', () => {
2424
expect(versionSelector(undefined, PACKAGE_VERSION)).toEqual('next');
2525
});
2626

27-
it('should use the exact JS version if tag is snapshot', () => {
27+
it('should use the exact package version if tag is snapshot', () => {
2828
const PACKAGE_VERSION = '1.0.0-snapshot.0';
2929
// @ts-ignore
3030
global.JS_PACKAGE_VERSION = '2.0.0-snapshot.0';
3131

32-
expect(versionSelector(undefined, PACKAGE_VERSION)).toEqual('2.0.0-snapshot.0');
32+
expect(versionSelector(undefined, PACKAGE_VERSION)).toEqual('1.0.0-snapshot.0');
3333
});
3434

3535
// We replaced semver with 2 custom regexes

packages/shared/src/versionSelector.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const versionSelector = (clerkJSVersion: string | undefined, packageVersi
1717
const prereleaseTag = getPrereleaseTag(packageVersion);
1818
if (prereleaseTag) {
1919
if (prereleaseTag === 'snapshot') {
20-
return JS_PACKAGE_VERSION;
20+
return packageVersion;
2121
}
2222

2323
return prereleaseTag;

scripts/canary.mjs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ try {
2323
// this will remove the prerelease versions
2424
// but will also clear the changeset .md files
2525
await $`pnpm changeset version`;
26-
// generate a temp .md file that indicates that all packages have changes
27-
// in order to force a snapshot release
28-
await $`touch .changeset/snap.md && echo ${snapshot} > .changeset/snap.md`;
2926
} catch {
30-
// otherwise, do nothing
27+
// not in pre-release mode, continue
3128
}
3229

30+
// Always generate a temp .md file that indicates that all packages have changes
31+
// in order to force a canary release of all packages
32+
await $`touch .changeset/snap.md && echo ${snapshot} > .changeset/snap.md`;
33+
3334
const res = await $`pnpm changeset version --snapshot canary`;
3435
const success = !res.stderr.includes('No unreleased changesets found');
3536

0 commit comments

Comments
 (0)