fixing releases

scripts/release.js

@@ -8,6 +8,15 @@ const ONLY_ON_BRANCH = 'v2';
 const VERSION_TAG = 'alpha';
 const VERSION_INC = 'patch';
 
+function run() {
+  // if (!validateEnv()) {
+  //   return;
+  // }
+  // setupGit();
+  // createNpmRc();
+  versionTagAndPublish();
+}
+
 function validateEnv() {
   if (!process.env.CI || !process.env.TRAVIS) {
     throw new Error(`releasing is only available from Travis CI`);
@@ -35,55 +44,53 @@ function setupGit() {
   exec.execSync(`git checkout ${ONLY_ON_BRANCH}`);
 }
 
-function getNextVersion() {
+function createNpmRc() {
+  const content = `
+email=\${NPM_EMAIL}
+//registry.npmjs.org/:_authToken=\${NPM_TOKEN}
+`;
+  fs.writeFileSync(`.npmrc`, content);
+}
+
+function versionTagAndPublish() {
   const packageVersion = semver.clean(process.env.npm_package_version);
   console.log(`package version: ${packageVersion}`);
-  const current = exec.execSyncRead(`npm view ${process.env.npm_package_name} dist-tags.${VERSION_TAG}`);
-  console.log(`current published version: ${current}`);
 
-  if (semver.gt(packageVersion, current)) {
-    return packageVersion;
-  } else {
-    return semver.inc(current, VERSION_INC);
-  }
-}
+  const currentPublished = findCurrentPublishedVersion();
+  console.log(`current published version: ${currentPublished}`);
 
-function calcNewVersion() {
-  let candidate = getNextVersion();
-  while (isAlreadyPublished(candidate)) {
-    console.log(`${candidate} already published`);
-    candidate = semver.inc(candidate, VERSION_INC);
-  }
-  return candidate;
+  const version = semver.gt(packageVersion, currentPublished) ? packageVersion : semver.inc(currentPublished, VERSION_INC);
+  tryPublishAndTag(version);
 }
 
-function isAlreadyPublished(version) {
-  return exec.execSyncRead(`npm view ${process.env.npm_package_name}@${version} version`).length > 0;
+function findCurrentPublishedVersion() {
+  return exec.execSyncRead(`npm view ${process.env.npm_package_name} dist-tags.${VERSION_TAG}`);
 }
 
-function createNpmRc() {
-  const content = `
-email=\${NPM_EMAIL}
-//registry.npmjs.org/:_authToken=\${NPM_TOKEN}
-`;
-  fs.writeFileSync(`.npmrc`, content);
+function tryPublishAndTag(version) {
+  let theCandidate = version;
+  let retry = 0;
+  while (retry < 5) { //eslint-disable-line
+    try {
+      tagAndPublish(theCandidate);
+      console.log(`Released ${theCandidate}`);
+      return;
+    } catch (e) {
+      const alreadyPublished = _.includes(e.message, 'You cannot publish over the previously published version');
+      if (!alreadyPublished) {
+        throw e;
+      }
+      retry++;
+      theCandidate = semver.inc(theCandidate, VERSION_INC);
+    }
+  }
 }
 
 function tagAndPublish(newVersion) {
-  exec.execSync(`npm version ${newVersion} -m "v${newVersion} [ci skip]"`);
+  exec.execSync(`npm --no-git-tag-version version ${newVersion}`);
   exec.execSync(`npm publish --tag ${VERSION_TAG}`);
-  exec.execSyncSilent(`git push deploy --tags || true`);
-}
-
-function run() {
-  if (!validateEnv()) {
-    return;
-  }
-  setupGit();
-  createNpmRc();
-  const newVersion = calcNewVersion();
-  console.log(`new version is: ${newVersion}`);
-  tagAndPublish(newVersion);
+  exec.execSync(`git tag -a ${newVersion} -m "${newVersion}"`);
+  exec.execSyncSilent(`git push deploy ${newVersion} || true`);
 }
 
 run();