From cc3a4bee701282902026258bb01980a91949337f Mon Sep 17 00:00:00 2001 From: Na Li Date: Wed, 25 Mar 2020 15:11:37 -0700 Subject: [PATCH 1/3] Fix release.ts --- scripts/release.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/release.ts b/scripts/release.ts index 9c747d7b907..488ceed728e 100644 --- a/scripts/release.ts +++ b/scripts/release.ts @@ -139,12 +139,16 @@ async function main() { `${dir}/package.json`; let pkg = `${fs.readFileSync(packageJsonPath)}`; const parsedPkg = JSON.parse(`${pkg}`); + // We can't use parsedPkg.version because it is set to 0.0.0. npm is + // the only source of truth of the latest version. + const parsedPkgVersion = + $(`npm view @tensorflow/${packageName} dist-tags.latest`); console.log(chalk.magenta.bold( - `~~~ Processing ${packageName} (${parsedPkg.version}) ~~~`)); + `~~~ Processing ${packageName} (${parsedPkgVersion}) ~~~`)); - const patchUpdateVersion = getPatchUpdateVersion(parsedPkg.version); - let newVersion = parsedPkg.version; + const patchUpdateVersion = getPatchUpdateVersion(parsedPkgVersion); + let newVersion = parsedPkgVersion; if (!phase.leaveVersion) { newVersion = await question( `New version (leave empty for ${patchUpdateVersion}): `); @@ -162,7 +166,7 @@ async function main() { } pkg = `${pkg}`.replace( - `"version": "${parsedPkg.version}"`, `"version": "${newVersion}"`); + `"version": "0.0.0"`, `"version": "${newVersion}"`); if (deps != null) { for (let j = 0; j < deps.length; j++) { From c5801b952f362ad67167f2bbff7e7a545880a497 Mon Sep 17 00:00:00 2001 From: Na Li Date: Wed, 25 Mar 2020 15:20:52 -0700 Subject: [PATCH 2/3] Fix release.ts --- scripts/release.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release.ts b/scripts/release.ts index 488ceed728e..20e5fb3893b 100644 --- a/scripts/release.ts +++ b/scripts/release.ts @@ -166,7 +166,7 @@ async function main() { } pkg = `${pkg}`.replace( - `"version": "0.0.0"`, `"version": "${newVersion}"`); + `"version": "${parsedPkg.version}"`, `"version": "${newVersion}"`); if (deps != null) { for (let j = 0; j < deps.length; j++) { From 1aae626d211bb88df8587bfade44b01a2b75f422 Mon Sep 17 00:00:00 2001 From: Na Li Date: Wed, 25 Mar 2020 15:25:56 -0700 Subject: [PATCH 3/3] Fix release.ts --- scripts/release.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/release.ts b/scripts/release.ts index 20e5fb3893b..9857dbeed3f 100644 --- a/scripts/release.ts +++ b/scripts/release.ts @@ -108,9 +108,9 @@ async function main() { // Publishing packages in tfjs. if (phaseInt !== 0) { // Phase0 should be published and release branch should have been created. - const latestVersion = + const firstPackageLatestVersion = $(`npm view @tensorflow/${phases[0].packages[0]} dist-tags.latest`); - releaseBranch = `${name}_${latestVersion}`; + releaseBranch = `${name}_${firstPackageLatestVersion}`; $(`git clone -b ${releaseBranch} ${urlBase}tensorflow/tfjs ${ dir} --depth=1`); @@ -139,16 +139,14 @@ async function main() { `${dir}/package.json`; let pkg = `${fs.readFileSync(packageJsonPath)}`; const parsedPkg = JSON.parse(`${pkg}`); - // We can't use parsedPkg.version because it is set to 0.0.0. npm is - // the only source of truth of the latest version. - const parsedPkgVersion = + const latestVersion = $(`npm view @tensorflow/${packageName} dist-tags.latest`); console.log(chalk.magenta.bold( - `~~~ Processing ${packageName} (${parsedPkgVersion}) ~~~`)); + `~~~ Processing ${packageName} (${latestVersion}) ~~~`)); - const patchUpdateVersion = getPatchUpdateVersion(parsedPkgVersion); - let newVersion = parsedPkgVersion; + const patchUpdateVersion = getPatchUpdateVersion(latestVersion); + let newVersion = latestVersion; if (!phase.leaveVersion) { newVersion = await question( `New version (leave empty for ${patchUpdateVersion}): `);