Merge branch 'master' into pr/363

canonic-epicure · Mar 3, 2018 · 7bc58b4 · 7bc58b4
2 parents 9f3a4c4 + 755bcd1
commit 7bc58b4
Show file tree

Hide file tree

Showing 14 changed files with 1,889 additions and 602 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,6 @@ os:
 
 env:
   matrix:
-  - TRAVIS_NODE_VERSION="0.10"
-  - TRAVIS_NODE_VERSION="0.12"
   - TRAVIS_NODE_VERSION="4"
   - TRAVIS_NODE_VERSION="5"
   - TRAVIS_NODE_VERSION="6"
@@ -51,6 +49,9 @@ install:
 script:
   - npm test
 
+after_success:
+  - if [ $TRAVIS_BRANCH == "master" ]; then npm run prebuild -- -u $GITHUB_TOKEN; fi
+
 notifications:
   webhooks:
     urls:

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,13 +4,15 @@
 environment:
   matrix:
   # node.js
-    - nodejs_version: "0.10"
-    - nodejs_version: "0.12"
     - nodejs_version: "4"
     - nodejs_version: "5"
     - nodejs_version: "6"
     - nodejs_version: "Stable"
 
+platform:
+  - x86
+  - x64
+
 # Install scripts. (runs after repo cloning)
 install:
   # Get the latest stable version of Node 0.STABLE.latest
@@ -29,6 +31,8 @@ test_script:
   # run tests
   - npm test
 
-build: off
+on_success:
+  - IF "%APPVEYOR_PULL_REQUEST_NUMBER%" EQU "" npm run prebuild -- -u %GITHUB_TOKEN%
 
-version: "{build}"
+build: off
+version: "{build}"