chore(core): release canary version for e2e tests to avoid version ov…

…erlap (nrwl#11539)
barbados-clemens · Aug 12, 2022 · 001fed8 · 001fed8
1 parent d13d5eb
commit 001fed8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/scripts/e2e-build-package-publish.ts b/scripts/e2e-build-package-publish.ts
@@ -42,7 +42,7 @@ async function buildPackagePublishAndCleanPorts() {
 }
 
 async function updateVersionsAndPublishPackages() {
-  execSync(`yarn nx-release --local`, {
+  execSync(`yarn nx-release --local --canary`, {
     stdio: 'inherit',
   });
 }

diff --git a/scripts/nx-release.ts b/scripts/nx-release.ts
@@ -63,11 +63,12 @@ function hideFromGitIndex(uncommittedFiles: string[]) {
   }
 
   const lernaJsonPath = join(__dirname, '../lerna.json');
-  let originalLernaJson: Buffer;
+  let originalLernaJson: Buffer | undefined;
 
   if (options.local || options.tag === 'next') {
     originalLernaJson = readFileSync(lernaJsonPath);
   }
+
   if (options.local) {
     /**
      * Hide changes from Lerna
@@ -82,9 +83,10 @@ function hideFromGitIndex(uncommittedFiles: string[]) {
     process.on('SIGTERM', unhideFromGitIndex);
   }
 
-  const publishOptions = {
+  const publishOptions: Record<string, boolean | string | undefined> = {
     gitReset: false,
     distTag: options.tag,
+    canary: options.canary,
   };
 
   if (!options.skipPublish) {
@@ -94,7 +96,7 @@ function hideFromGitIndex(uncommittedFiles: string[]) {
     console.warn('Not Publishing because --dryRun was passed');
   }
 
-  if (options.local || options.tag === 'next') {
+  if (originalLernaJson) {
     writeFileSync(lernaJsonPath, originalLernaJson);
   }
 })();
@@ -125,6 +127,11 @@ function parseArgs() {
       alias: 'l',
       default: true,
     })
+    .option('canary', {
+      type: 'boolean',
+      description: 'Create canary version',
+      hidden: true,
+    })
     .option('force', {
       type: 'boolean',
       description: "Don't use this unless you really know what it does",