Allow releasing prereleases from different branches (wix#2447)

* lerna 3.22.1 * fingers crossed * env var name change * Back to lerna 2.11.0 * Fix log * tweaks * Publish 17.10.7-alpha.0 [ci skip] * Revert "Publish 17.10.7-alpha.0 [ci skip]" This reverts commit 1179988. * trying to update lerna through scripts * update script to new lerna API * --no-ci * --no-ci * lerna install now verbose * verbose++ * remove detox cli * npm global installation permission workaround * remove commented out code * prerelease version alignment with npmjs * revert back to 17.10.7 Co-authored-by: wixmobile <[email protected]>
bitumnus · Nov 3, 2020 · 60fd09a · 60fd09a
1 parent dc1d85b
commit 60fd09a
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 39 deletions.
diff --git a/detox-cli/package.json b/detox-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "detox-cli",
-  "version": "17.4.3",
+  "version": "17.10.7",
   "description": "detox CLI tool wrapper",
   "main": "index.js",
   "scripts": {

diff --git a/generation/package.json b/generation/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "generation",
-	"version": "17.8.5",
+	"version": "17.10.7",
 	"description": "Generate wrapper code for native dependencies",
 	"main": "index.js",
 	"private": true,

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "lerna": "2.4.0",
+  "lerna": "3.22.1",
   "packages": [
     "detox",
     "detox-cli",

diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
   },
   "devDependencies": {
     "chalk": "^2.4.2",
+    "lerna": "3.22.1",
     "lodash": "4.17.x",
     "semver": "5.x.x",
     "shell-utils": "1.x.x"

diff --git a/scripts/ci.android-release.js b/scripts/ci.android-release.js
@@ -3,7 +3,7 @@ const {log, logSection, getVersionSafe} = require('./ci.common');
 
 function run() {
   logSection('Initializing');
-  exec.execSync('lerna bootstrap');
+  exec.execSync('lerna bootstrap --no-ci');
 
   const versionType = process.env.RELEASE_VERSION_TYPE;
   logSection(`Pre-calculating future version... (versionType=${versionType})`);

diff --git a/scripts/ci.android.sh b/scripts/ci.android.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 
 # Approve unapproved SDK licenses
 yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses

diff --git a/scripts/ci.ios.sh b/scripts/ci.ios.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 
 source $(dirname "$0")/ci.sh
 

diff --git a/scripts/ci.publish.js b/scripts/ci.publish.js
@@ -3,14 +3,14 @@ const exec = require('shell-utils').exec;
 
 const {log, logSection, getVersionSafe} = require('./ci.common');
 
-function publishNewVersion(packageVersion) {
+function publishNewVersion(packageVersion, npmTag) {
   validatePrerequisites();
   projectSetup();
-  publishToNpm();
+  publishToNpm(npmTag);
 
   const newVersion = getVersionSafe();
   if (newVersion === packageVersion) {
-    log(`Stopping: Lerna\'s completed without upgrading the version - nothing to publish (version is ${newVersion})`);
+    log(`Stopping: Lerna completed without upgrading the version - nothing to publish (version is ${newVersion})`);
     return false;
   }
 
@@ -23,20 +23,15 @@ function validatePrerequisites() {
   if (!lernaBin) {
     throw new Error(`Cannot publish: lerna not installed!`);
   }
-
-  const lernaVersion = exec.execSyncRead('lerna --version');
-  if (!lernaVersion.startsWith('2.')) {
-    throw new Error(`Cannot publish: lerna version isn't 2.x.x (actual version is ${lernaVersion})`);
-  }
 }
 
 function projectSetup() {
   logSection('Project setup');
-  exec.execSync(`lerna bootstrap`);
-  exec.execSync(`git checkout master`);
+  exec.execSync(`git checkout ${process.env.GIT_BRANCH}`);
+  exec.execSync(`lerna bootstrap --no-ci`);
 }
 
-function publishToNpm() {
+function publishToNpm(npmTag) {
   logSection('Lerna publish');
 
   const versionType = process.env.RELEASE_VERSION_TYPE;
@@ -49,7 +44,7 @@ function publishToNpm() {
     log('SKIP NPM is set: Lerna-publishing without publishing to NPM');
   }
 
-  exec.execSync(`lerna publish --cd-version "${versionType}" --yes --skip-git ${(dryRun || skipNpm) ? '--skip-npm' : ''}`);
+  exec.execSync(`lerna publish --cd-version "${versionType}" --yes --dist-tag ${npmTag} ${npmTag === 'latest'? '': '--preid=alpha'} --skip-git ${(dryRun || skipNpm) ? '--skip-npm' : ''}`);
   exec.execSync('git status');
 }
 
@@ -64,8 +59,8 @@ function updateGit(newVersion) {
   if (dryRun) {
     log('DRY RUN: not pushing to git');
   } else {
-    exec.execSync(`git push deploy master`);
-    exec.execSync(`git push --tags deploy master`);
+    exec.execSync(`git push deploy ${process.env.GIT_BRANCH}`);
+    exec.execSync(`git push --tags deploy ${process.env.GIT_BRANCH}`);
   }
 }
 

diff --git a/scripts/ci.release.js b/scripts/ci.release.js
@@ -5,11 +5,9 @@ const {log, logSection, getVersionSafe} = require('./ci.common');
 
 const isRelease = (process.env.RELEASE_VERSION_TYPE && process.env.RELEASE_VERSION_TYPE !== 'none');
 
-const ONLY_ON_BRANCH = 'origin/master';
-
 function run() {
 	logSection('Script started');
-	if (!validateEnv()) {
+	if (!isEnvValid()) {
 		return;
 	}
 
@@ -19,7 +17,7 @@ function run() {
 	versionTagAndPublish();
 }
 
-function validateEnv() {
+function isEnvValid() {
 	if (!process.env.JENKINS_CI) {
 		throw new Error(`Release blocked: Not on a CI build machine!`);
 	}
@@ -29,11 +27,6 @@ function validateEnv() {
 		return false;
 	}
 
-	if (process.env.GIT_BRANCH !== ONLY_ON_BRANCH) {
-		log(`Release blocked: Not publishing on branch ${process.env.GIT_BRANCH}, which isn't ${ONLY_ON_BRANCH}`);
-		return false;
-	}
-
 	return true;
 }
 
@@ -65,11 +58,11 @@ function versionTagAndPublish() {
 	log(`    package version: ${packageVersion}`);
 
 	const currentPublished = findCurrentPublishedVersion();
-	log(`    current published version: ${currentPublished}`);
+	log(`    current published version from ${process.env.GIT_BRANCH}: ${currentPublished}`);
 
 	if (isRelease) {
 		const publishNewVersion = require('./ci.publish');
-		publishNewVersion(packageVersion);
+		publishNewVersion(packageVersion, releaseNpmTag());
 	} else {
 		// Disabled for the time being
 		// const tagVersion = require('./ci.tagversion');
@@ -79,8 +72,18 @@ function versionTagAndPublish() {
 	log(`Great success, much amaze`);
 }
 
+function releaseNpmTag() {
+	if (process.env.GIT_BRANCH === 'master') {
+		return 'latest';
+	} else if (process.env.RELEASE_NPM_TAG) {
+		return process.env.RELEASE_NPM_TAG;
+	} else {
+		return process.env.GIT_BRANCH;
+	}
+}
+
 function findCurrentPublishedVersion() {
-	return exec.execSyncRead(`npm view detox dist-tags.latest`);
+	return exec.execSyncRead(`npm view detox dist-tags.${releaseNpmTag()}`);
 }
 
 run();
diff --git a/scripts/ci.sh b/scripts/ci.sh
@@ -1,12 +1,12 @@
 #!/bin/bash -e
 
 source $(dirname "$0")/logger.sh
+source $(dirname "$0")/install.sh
 
 if [ ! -z ${REACT_NATIVE_VERSION} ]; then
   node scripts/change_react_native_version.js "detox/test" ${REACT_NATIVE_VERSION}
 fi
 
-run_f "lerna bootstrap"
-
+run_f "lerna bootstrap --no-ci"
 run_f "lerna run build"
 run_f "lerna run test"
diff --git a/scripts/demo-projects.sh b/scripts/demo-projects.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
 source $(dirname "$0")/logger.sh
+source $(dirname "$0")/install.sh
 
 # Only update the demo-react-native project; others will use this binary
 node scripts/change_react_native_version.js "examples/demo-react-native" ${REACT_NATIVE_VERSION}
 
-run_f "lerna bootstrap"
+run_f "lerna bootstrap --no-ci"
diff --git a/scripts/install.android.sh b/scripts/install.android.sh
@@ -1,4 +1,4 @@
 #!/bin/bash -e
 
-$(dirname "$0")/install.sh
+source $(dirname "$0")/install.sh
 
diff --git a/scripts/install.ios.sh b/scripts/install.ios.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-$(dirname "$0")/install.sh
+source $(dirname "$0")/install.sh
 
 gem install xcpretty >/dev/null 2>&1
 

diff --git a/scripts/install.sh b/scripts/install.sh
@@ -1,5 +1,8 @@
 #!/bin/bash -e
 
-npm install -g [email protected] >/dev/null 2>&1
+mkdir ~/.npm-global
+npm config set prefix '~/.npm-global'
+export PATH=~/.npm-global/bin:$PATH
+
+npm install -g [email protected]
 npm install -g react-native-cli >/dev/null 2>&1
-npm install -g detox-cli >/dev/null 2>&1