فهرست منبع

do not create tags on prerelease and run version check first

Steven Silvester 6 سال پیش
والد
کامیت
ae5cc16cea
2فایلهای تغییر یافته به همراه10 افزوده شده و 10 حذف شده
  1. 1 1
      buildutils/src/bumpversion.ts
  2. 9 9
      scripts/travis_script.sh

+ 1 - 1
buildutils/src/bumpversion.ts

@@ -25,7 +25,7 @@ commander
 
     // For major or minor bumps, bump all of the JS packages as well to alpha
     if (v === 'major' || v === 'minor') {
-      let cmd = `lerna version preminor --canary --force-publish=* -m \"Prerelease version\" --no-push`;
+      let cmd = `lerna version preminor --no-git-tag-version --force-publish=* -m \"Prerelease version\" --no-push`;
       utils.run(cmd);
     }
 

+ 9 - 9
scripts/travis_script.sh

@@ -52,6 +52,15 @@ if [[ $GROUP == integrity ]]; then
     # Run the integrity script first
     jlpm run integrity --force
 
+    # Make sure we can bump the version
+    jlpm bumpversion minor
+    jlpm bumpversion major
+    jlpm bumpversion patch
+    jlpm bumpversion release
+    jlpm bumpversion build
+    VERSION=$(python setup.py --version)
+    if [[ $VERSION != *rc1 ]]; then exit 1; fi
+
     # Check yarn.lock file
     jlpm check --integrity
 
@@ -101,15 +110,6 @@ if [[ $GROUP == integrity ]]; then
     kill $TASK_PID
     wait $TASK_PID
 
-    # Make sure we can bump the version
-    jlpm bumpversion minor
-    jlpm bumpversion major
-    jlpm bumpversion patch
-    jlpm bumpversion release
-    jlpm bumpversion build
-    VERSION=$(python setup.py --version)
-    if [[ $VERSION != *rc1 ]]; then exit 1; fi
-
 fi