Skip to content

Commit f8a5710

Browse files
committed
Fix update-version scripts
1 parent 562db65 commit f8a5710

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

.github/workflows/packages_publishing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
6767
- name: Set timestamp version
6868
if: ${{ env.SET_TIMESTAMP_VERSION == 'true' }}
69-
run: pnpx ts-node tools/scripts/set-timestamp-version
69+
run: pnpx ts-node tools/scripts/set-timestamp-version --config.optional=true
7070

7171
- name: Build npm packages
7272
env:

tools/scripts/common/version.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import path from 'path';
44
import { ROOT_DIR } from './paths';
55
import { validateVersion } from './monorepo-tools';
66

7-
export function updateVersion(version: string | undefined): void {
7+
export function updateVersion(version: string | undefined, pnpmArgs: string[]): void {
88
if (!version) {
99
console.error(`Version can't be empty`);
1010
process.exit(1);
@@ -19,7 +19,7 @@ export function updateVersion(version: string | undefined): void {
1919

2020
sh.sed('-i', /"version": ".*"/, `"version": "${version}"`, workspacesPaths);
2121

22-
sh.exec('pnpm install --no-frozen-lockfile');
22+
sh.exec(`pnpm install ${["--no-frozen-lockfile", ...pnpmArgs].join(" ")}`);
2323
}
2424

2525
export function updateVersionJs(version: string | undefined, build?: string | undefined): void {

tools/scripts/set-timestamp-version.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import pkg from '../../package.json';
33
import { formatVersion, makeVersion } from './common/monorepo-tools';
44
import { updateVersion, updateVersionJs } from './common/version';
55

6+
const [, ,...pnpmArgs] = process.argv;
7+
68
const formattedVersion = formatVersion(pkg.version);
79
if(formattedVersion === undefined) {
810
console.error(`Unable to generate timestamp version from ${pkg.version}`);
@@ -13,4 +15,4 @@ const timestampVersion = makeVersion(formattedVersion, true, new Date());
1315
sh.set('-e');
1416

1517
updateVersionJs(timestampVersion.baseVersion, timestampVersion.build);
16-
updateVersion(timestampVersion.fullVersion);
18+
updateVersion(timestampVersion.fullVersion, pnpmArgs);

tools/scripts/update-version.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import sh from 'shelljs';
22
import { updateVersion, updateVersionJs } from './common/version';
33

4-
const version = process.argv[2];
4+
const [, , version, ...pnpmArgs] = process.argv;
55

66
if (version == null) {
7-
console.error(`Usage: 'pnpm run all:update-version $version' (XX.X.X)`);
7+
console.error(`Usage: 'pnpm run all:update-version <version> <pnpm_args>' (XX.X.X)`);
88
process.exit(1);
99
}
1010

1111
sh.set('-e');
1212

1313
updateVersionJs(version);
14-
updateVersion(version);
14+
updateVersion(version, pnpmArgs);

0 commit comments

Comments
 (0)