HOTFIX: Android binary version alignment

Author: rotemmiz

scripts/ci.android-release.js

@@ -1,13 +1,16 @@
 const exec = require('shell-utils').exec;
-const {log, logSection, getVersionSafe} = require('./ci.common');
+const {log, logSection, getVersionSafe, releaseNpmTag} = require('./ci.common');
 
 function run() {
   logSection('Initializing');
   exec.execSync('lerna bootstrap --no-ci');
 
   const versionType = process.env.RELEASE_VERSION_TYPE;
   logSection(`Pre-calculating future version... (versionType=${versionType})`);
-  exec.execSync(`lerna publish --cd-version "${versionType}" --yes --skip-git --skip-npm`);
+
+  const npmTag = releaseNpmTag();
+  const preid = npmTag === 'latest'? '': `--preid=${npmTag}`;
+  exec.execSync(`lerna publish --cd-version "${versionType}" --yes ${preid} --no-git-tag-version --no-push --skip-npm`);
   const futureVersion = getVersionSafe();
   log('Version is: ' + futureVersion);
   exec.execSync('git reset --hard');

scripts/ci.common.js

@@ -22,8 +22,19 @@ function getVersionSafe() {
   return version;
 }
 
+function releaseNpmTag() {
+  if (process.env.RELEASE_NPM_TAG) {
+    return process.env.RELEASE_NPM_TAG;
+  } else if (process.env.GIT_BRANCH === 'master') {
+    return 'latest';
+  } else {
+    return process.env.GIT_BRANCH;
+  }
+}
+
 module.exports = {
   log,
   logSection,
   getVersionSafe,
+  releaseNpmTag
 };

scripts/ci.release.js

@@ -1,7 +1,7 @@
 /* tslint:disable: no-console */
 const exec = require('shell-utils').exec;
 const fs = require('fs');
-const {log, logSection, getVersionSafe} = require('./ci.common');
+const {log, logSection, getVersionSafe, releaseNpmTag} = require('./ci.common');
 
 const isRelease = (process.env.RELEASE_VERSION_TYPE && process.env.RELEASE_VERSION_TYPE !== 'none');
 
@@ -72,15 +72,6 @@ function versionTagAndPublish() {
 	log(`Great success, much amaze`);
 }
 
-function releaseNpmTag() {
-	if (process.env.RELEASE_NPM_TAG) {
-		return process.env.RELEASE_NPM_TAG;
-	} else if (process.env.GIT_BRANCH === 'master') {
-		return 'latest';
-	} else {
-		return process.env.GIT_BRANCH;
-	}
-}
 
 function findCurrentPublishedVersion() {
 	return exec.execSyncRead(`npm view detox dist-tags.${releaseNpmTag()}`);