Merge branch 'master' into bindings

vensend · Jun 6, 2019 · 274bd30 · 274bd30
2 parents 1c9aa7d + 83be24c
commit 274bd30
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ services:
 env:
   global:
     - MIN_SUPPORTED_NODEJS_VERSION=6
-    - LATEST_STABLE_NODEJS_VERSION=11
+    - LATEST_STABLE_NODEJS_VERSION=12
   matrix:
     - BUILD_TASK=test
       TAG=3.0.0-contrib
@@ -46,10 +46,10 @@ env:
       NODE_MAJOR_VERSION=10
     - BUILD_TASK=test
       TAG=3.4.6-contrib
-      NODE_MAJOR_VERSION=$LATEST_STABLE_NODEJS_VERSION
+      NODE_MAJOR_VERSION=11
     - BUILD_TASK=test
       TAG=3.4.6-contrib
-      NODE_MAJOR_VERSION=12
+      NODE_MAJOR_VERSION=$LATEST_STABLE_NODEJS_VERSION
 
 before_install:
   - chmod +x ./ci/$BUILD_TASK/$BUILD_TASK.sh

diff --git a/package.json b/package.json
@@ -29,12 +29,12 @@
   "main": "./lib/opencv4nodejs.js",
   "typings": "./lib/index.d.ts",
   "scripts": {
-    "install": "node-gyp rebuild",
+    "install": "node-gyp rebuild --jobs max",
     "configure": "node-gyp configure",
-    "build": "node-gyp configure build",
-    "rebuild": "node-gyp rebuild",
+    "build": "node-gyp configure build --jobs max",
+    "rebuild": "node-gyp rebuild --jobs max",
     "clean": "node-gyp clean",
-    "build-debug": "node-gyp rebuild --debug"
+    "build-debug": "node-gyp rebuild --debug --jobs max"
   },
   "gypfile": true,
   "dependencies": {