Merge pull request #69 from lgeiger/deploy-docs

Deploy docs on master

Author: rgbkrk

.travis.yml

@@ -43,13 +43,15 @@ script: if [[ -z "$ELECTRON" ]]; then travis_retry npm run coverage; else travis
 after_success:
   - 'if [[ $DEPLOY == true && $TRAVIS_OS_NAME == linux]]; then bash <(curl -s https://codecov.io/bash); fi'
 
+after_sucess:
+  - bash ./scripts/publish_docs.sh
+
 deploy:
   provider: script
   skip_cleanup: true
   # Linking to prebuild directly since it doesn't work inside a npm script.
   script:
     - node_modules/prebuild/bin.js --all -u $GH_TOKEN
-    - bash ./travis_publish_docs.sh
   on:
     condition: "$DEPLOY = true"
     tags: true

scripts/publish_docs.sh

@@ -1,14 +1,18 @@
 #!/bin/bash
+if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_BRANCH == "master" && $DEPLOY == "true" ]]
+then
+    npm run build:docs
 
-npm run build:docs
+    ( cd docs
+    git init
+    git config user.email "travis@travis-ci.com"
+    git config user.name "Travis Bot"
 
-( cd docs
-git init
-git config user.email "travis@travis-ci.com"
-git config user.name "Travis Bot"
-
-git add .
-git commit -m "Publish docs from $TRAVIS_BUILD_NUMBER"
-git push --force --quiet "https://${GH_TOKEN}@${GH_REF}" master:gh-pages > /dev/null 2>&1
-echo "Documentation has been published!"
-)
+    git add .
+    git commit -m "Publish docs from $TRAVIS_BUILD_NUMBER"
+    git push --force --quiet "https://${GH_TOKEN}@${GH_REF}" master:gh-pages > /dev/null 2>&1
+    echo "Documentation has been published!"
+    )
+else
+    echo "Documentation has not been published because not on master!"
+fi