chore(git): use .gitignore and modify deploy script

azu · Jan 10, 2015 · a896ba3 · a896ba3
1 parent 7f1070b
commit a896ba3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,7 @@
 node_modules/
+embed/
+/index.html
+/javascript-promise-book.pdf
+/javascript-promise-book.xml
+/javascript-promise-omake.pdf
+/javascript-promise-omake.xml
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ pdf:
 	@./_tools/build_pdf.sh javascript-promise-book.xml
 	@echo "Done!"
 
-note-pdf:
+pdf-note:
 	@echo "Generate PDF..."
 	@gulp embed
 	@echo "Building asciidoc"

diff --git a/_tools/deploy-gh-pages.sh b/_tools/deploy-gh-pages.sh
@@ -24,6 +24,6 @@ lastCommit=$(git log --oneline | head -n 1)
 echo "=COMMIT="
 echo "MESSAGE :" $lastCommit
 
-git add -A .
+git add -A -f .
 git commit -m "Travis build $TRAVIS_BUILD_NUMBER"
 git push --force --quiet "https://${GH_TOKEN}@${GH_REF}" gh-pages > /dev/null
diff --git a/_tools/deploy-preview-html.sh b/_tools/deploy-preview-html.sh
@@ -8,7 +8,7 @@ make html
 cat ./index.html | _tools/cli-rel-to-abs.js | _tools/cli-inject-meta.js > $TRAVIS_JOB_NUMBER.html
 
 git pull
-git add -A $TRAVIS_JOB_NUMBER.html
+git add -A -f $TRAVIS_JOB_NUMBER.html
 git commit -m "Preview HTML $TRAVIS_BUILD_NUMBER"
 git push --quiet --force "https://${GH_TOKEN}@${GH_REF}" preview-html > /dev/null
 

diff --git a/package.json b/package.json
@@ -26,12 +26,12 @@
     "ypromise": "~0.2"
   },
   "devDependencies": {
-    "browserify": "^6.3.2",
+    "browserify": "^8.1.0",
     "cheerio": "^0.18.0",
     "espower-loader": "^0.10.0",
     "esprima": "^1.2.2",
     "esprima-fb": "^4001.1.0-dev-harmony-fb",
-    "fs-extra": "^0.12.0",
+    "fs-extra": "^0.14.0",
     "gulp": "^3.6.2",
     "gulp-inlining-node-require": "0.0.3",
     "gulp-remove-use-strict": "0.0.2",
@@ -41,11 +41,11 @@
     "http-echo": "0.0.2",
     "inlining-node-require": "^0.1.0",
     "intelli-espower-loader": "^0.5.0",
-    "minifyify": "^4.0.3",
+    "minifyify": "^5.0.0",
     "mocha": "^2.0.1",
-    "nock": "^0.50.0",
+    "nock": "^0.56.0",
     "power-assert": "^0.10.0",
-    "promise-test-helper": "0.0.4",
+    "promise-test-helper": "^0.1.0",
     "q": "^1.0.1",
     "q-io": "^1.11.0",
     "rel-to-abs": "^0.1.0",
@@ -54,4 +54,4 @@
     "vinyl-source-stream": "^1.0.0",
     "watchify": "^2.1.1"
   }
-}
+}