summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2014-03-06 10:30:39 -0500
committerAlex Xu <alex_y_xu@yahoo.ca>2014-03-06 10:30:39 -0500
commitcbb002ff60c33d6c4bfcaad42c8df1cfda8f7ea3 (patch)
tree5dbb2f9e3601ba17c4618682a6cc09675e1388ac
parentb71111a0d852263498e610e370ccb94f04b21c8b (diff)
downloadhtml5ks-cbb002ff60c33d6c4bfcaad42c8df1cfda8f7ea3.tar.xz
html5ks-cbb002ff60c33d6c4bfcaad42c8df1cfda8f7ea3.zip
delete travis template, NPM --quiet
-rw-r--r--.travis.yml4
-rw-r--r--Makefile1
2 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 58a6e04..f04c491 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,3 @@ notifications:
irc:
channels:
- "chat.freenode.net#html5ks"
- template:
- - "%{repository_name}#%{build_number} of %{commit} on %{branch} by %{author} took %{duration} and ended: %{message}"
- - "Compare: %{compare_url}"
- - "Build details: %{build_url}"
diff --git a/Makefile b/Makefile
index 14372c2..1501ded 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ WEBPMUX ?= webpmux
CONVERT ?= convert
APNGASM ?= apngasm
NPM ?= npm
+NPM += --quiet
JS_COMPRESSOR ?= uglifyjs
LOCAL_UGLIFYJS := node_modules/.bin/uglifyjs
UGLIFYJS ?= $(LOCAL_UGLIFYJS)