Merge branch 'master-local' into master-dist

patternfly · Sep 17, 2018 · 73294e3 · 73294e3
2 parents 58a7d01 + 5520f25
commit 73294e3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,12 +28,14 @@ script:
   - sh -x ./node_modules/patternfly-eng-release/scripts/_build.sh -p
 
 after_success:
+  - 'if [[ "$TRAVIS_SECURE_ENV_VARS" = "true" && "$TRAVIS_BRANCH" = "master" ]]; then
+       npm run semantic-release-prepare;
+       sh -x ./node_modules/patternfly-eng-release/scripts/semantic-release/_bump.sh -p;
+     fi'
+
   - 'if [[ "$TRAVIS_SECURE_ENV_VARS" = "true" && "$TRAVIS_BRANCH" = "master-dist" ]]; then
        npm prune;
-       npm run semantic-release-pre;
-       sh -x ./node_modules/patternfly-eng-release/scripts/semantic-release/_bump.sh -p;
-       sh -x ./node_modules/patternfly-eng-release/scripts/semantic-release/_publish-npm.sh || travis_terminate 0;
-       npm run semantic-release-post;
+       npm run semantic-release;
        sh -x ./node_modules/patternfly-eng-release/scripts/semantic-release/_publish-webjar.sh -p;
        sh -x ./node_modules/patternfly-eng-release/scripts/semantic-release/_release-all.sh -o;
      fi'

diff --git a/package.json b/package.json
@@ -101,8 +101,7 @@
     "start-patternfly": "grunt build-patternfly serve",
     "start-rcue": "grunt build-rcue serve",
     "grunt": "grunt",
-    "semantic-release": "semantic-release --prepare && npm publish && semantic-release --publish",
-    "semantic-release-publish": "semantic-release --publish",
+    "semantic-release": "semantic-release",
     "semantic-release-prepare": "semantic-release --prepare",
     "commit": "git-cz",
     "commitmsg": "commitlint -e",