Merge pull request #4 from swaggo/pei/fix-travis

pei0804 · web-flow · commit 3308dfdf3f72 · 2018-03-28T17:34:46.000+09:00
Fix travis script
diff --git a/.travis.yml b/.travis.yml
@@ -3,11 +3,16 @@ node_js:
   - '7'
 sudo: false
 script:
-  - $TRAVIS_BRANCH == "master" && $TRAVIS_PULL_REQUEST == "false" && make travis-deploy
+  - sudo -v && wget -nv -O- https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py | sudo python -c "import sys; main=lambda:sys.stderr.write('Download failed\n'); exec(sys.stdin.read()); main()"
+  - sudo ln -s /opt/calibre/ebook-convert /usr/local/bin/
+  - sh ./deploy.sh
 before_install:
   - openssl aes-256-cbc -K $encrypted_e8c0cd5f9239_key -iv $encrypted_e8c0cd5f9239_iv -in deploy_key.enc -out deploy_key -d
   - chmod 600 deploy_key
   - eval `ssh-agent -s`
   - ssh-add deploy_key
   - git config --global user.name "publisher"
   - git config --global user.email "publisher@git.hub"
+branches:
+    only:
+      - master
diff --git a/Makefile b/Makefile
@@ -41,10 +41,3 @@ publish: build pdf epub mobi
 clean:
 	rm -rf _book
 	rm -rf node_modules
-
-travis-deploy:
-	sudo -v && wget -nv -O- https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py | sudo python -c "import sys; main=lambda:sys.stderr.write('Download failed\n'); exec(sys.stdin.read()); main()"
-	sudo ln -s /opt/calibre/ebook-convert /usr/local/bin/
-	$(MAKE) install
-	$(MAKE) publish
-
diff --git a/deploy.sh b/deploy.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+    exit 0
+fi
+
+make publish
