Steven Silvester il y a 6 ans
Parent
commit
09e0fba70e
3 fichiers modifiés avec 10 ajouts et 5 suppressions
  1. 3 3
      buildutils/src/bumpversion.ts
  2. 2 2
      buildutils/src/patch-release.ts
  3. 5 0
      scripts/travis_script.sh

+ 3 - 3
buildutils/src/bumpversion.ts

@@ -44,9 +44,6 @@ commander
       return;
     }
 
-    // Bump the version.
-    utils.run(`bumpversion ${spec}`);
-
     // Determine the version spec to use for lerna.
     let lernaVersion = 'preminor';
     if (spec === 'build') {
@@ -66,6 +63,9 @@ commander
       return;
     }
 
+    // Bump the version.
+    utils.run(`bumpversion ${spec}`);
+
     // Run the post-bump script.
     utils.postbump();
   });

+ 2 - 2
buildutils/src/patch-release.ts

@@ -17,8 +17,8 @@ if (pkgs) {
 
 // Patch the python version
 utils.run('bumpversion patch'); // switches to alpha
-utils.run('bumpversion release'); // switches to rc
-utils.run('bumpversion release'); // switches to final.
+utils.run('bumpversion release --allow-dirty'); // switches to rc
+utils.run('bumpversion release --allow-dirty'); // switches to final.
 
 // Run post-bump actions.
 utils.postbump();

+ 5 - 0
scripts/travis_script.sh

@@ -65,6 +65,11 @@ if [[ $GROUP == integrity ]]; then
     VERSION=$(python setup.py --version)
     if [[ $VERSION != *rc1 ]]; then exit 1; fi
 
+    # make sure we can patch release
+    jlpm patch:release
+    jlpm patch:release console
+    jlpm patch:release filebrowser notebook
+
     # Check yarn.lock file
     jlpm check --integrity