opencv 3.4.1 travis build + use updated docker images for travis ci (#…

…188)

opencv 3.4.1 travis build + use updated docker images for travis ci

.travis.yml

@@ -11,40 +11,53 @@ services:
 matrix:
   include:
   - env:
-    - BUILD_TASK=build-opencv3.0
-    - DOCKER_IMAGE=opencv3.0-node6
+    - BUILD_TASK=test
+    - TAG=3.0.0
   - env:
-    - BUILD_TASK=build-opencv3.0-contrib
-    - DOCKER_IMAGE=opencv3.0-contrib-node6
+    - BUILD_TASK=test
+    - TAG=3.0.0-contrib
   - env:
-    - BUILD_TASK=build-opencv3.1
-    - DOCKER_IMAGE=opencv3.1-node6
+    - BUILD_TASK=test
+    - TAG=3.1.0
   - env:
-    - BUILD_TASK=build-opencv3.1-contrib
-    - DOCKER_IMAGE=opencv3.1-contrib-node6
+    - BUILD_TASK=test
+    - TAG=3.1.0-contrib
   - env:
-    - BUILD_TASK=build-opencv3.3
-    - DOCKER_IMAGE=opencv3.3-node6
+    - BUILD_TASK=test
+    - TAG=3.2.0
   - env:
-    - BUILD_TASK=build-opencv3.3-contrib
-    - DOCKER_IMAGE=opencv3.3-contrib-node6
+    - BUILD_TASK=test
+    - TAG=3.2.0-contrib
   - env:
-    - BUILD_TASK=build-opencv3.4
-    - DOCKER_IMAGE=opencv3.4-node6
+    - BUILD_TASK=test
+    - TAG=3.3.0
   - env:
-    - BUILD_TASK=build-opencv3.4-contrib
-    - DOCKER_IMAGE=opencv3.4-contrib-node6
+    - BUILD_TASK=test
+    - TAG=3.3.0-contrib
   - env:
-    - BUILD_TASK=build-opencv3.2-contrib-with-coverage
-    - DOCKER_IMAGE=opencv3.2-contrib-node6
+    - BUILD_TASK=test
+    - TAG=3.4.0
+  - env:
+    - BUILD_TASK=cover
+    - TAG=3.4.0-contrib
+  - env:
+    - BUILD_TASK=test
+    - TAG=3.4.1
+  - env:
+    - BUILD_TASK=test
+    - TAG=3.4.1-contrib
+
+before_install:
+  - chmod +x ./ci/$BUILD_TASK/$BUILD_TASK.sh
 
-install: travis_wait 30 docker pull justadudewhohacks/$DOCKER_IMAGE
+install: travis_wait 30 docker pull justadudewhohacks/opencv4nodejs-ci:$TAG
 
-script: npm run $BUILD_TASK
+script:
+  - cd ./ci/$BUILD_TASK
+  - npm run $BUILD_TASK $TAG
 
 after_success:
-  - if [ $BUILD_TASK = 'build-opencv3.2-contrib-with-coverage' ]; then
-    cd ./ci;
+  - if [ $BUILD_TASK = 'cover' ]; then
     npm install;
     npm run codecov -- -t $CODECOV_TOKEN;
     fi

ci/cover/Dockerfile

@@ -0,0 +1,14 @@
+ARG TAG
+
+FROM justadudewhohacks/opencv4nodejs-ci:${TAG}
+
+RUN apt-get update
+RUN apt-get install lcov -y
+
+COPY ./ ./
+CMD ["bin/bash", "./ci/cover/script/run-cover.sh"]
+
+
+
+
+

ci/cover/cover.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+image=opencv4nodejs-ci_$1-with-coverage
+docker build -t $image -f ./Dockerfile --build-arg TAG=$1 ../../
+docker run -v $PWD/coverage-report:/test/coverage-report $image

ci/package.json → ci/cover/package.json

@@ -1,5 +1,6 @@
 {
   "scripts": {
+    "cover": "bash ./cover.sh",
     "codecov": "codecov -f ./coverage-report/opencv4nodejs.info"
   },
   "dependencies": {

ci/test/Dockerfile

@@ -0,0 +1,6 @@
+ARG TAG
+
+FROM justadudewhohacks/opencv4nodejs-ci:${TAG}
+
+COPY ./ ./
+CMD ["bin/bash", "./ci/test/script/run-test.sh"]

ci/test/package.json

@@ -0,0 +1,5 @@
+{
+  "scripts": {
+    "test": "bash ./test.sh"
+  }
+}

ci/test.sh → ci/test/script/run-test.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 export OPENCV4NODEJS_DISABLE_AUTOBUILD=1
+echo installing
 npm install --unsafe-perm
+echo running tests
 cd ./test
 npm install --unsafe-perm
 npm run test-docker

ci/test/test.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+image=opencv4nodejs-ci_$1
+docker build -t $image -f ./Dockerfile --build-arg TAG=$1 ../../
+docker run $image

package.json

@@ -34,17 +34,7 @@
     "build": "node-gyp configure build",
     "rebuild": "node-gyp rebuild",
     "clean": "node-gyp clean",
-    "build-debug": "node-gyp rebuild --debug",
-    "build-opencv3.0": "docker build -t opencv3.0 -f ./ci/opencv3.0/Dockerfile . &&docker run opencv3.0",
-    "build-opencv3.0-contrib": "docker build -t opencv3.0-contrib -f ./ci/opencv3.0-contrib/Dockerfile . &&docker run opencv3.0-contrib",
-    "build-opencv3.1": "docker build -t opencv3.1 -f ./ci/opencv3.1/Dockerfile . &&docker run opencv3.1",
-    "build-opencv3.1-contrib": "docker build -t opencv3.1-contrib -f ./ci/opencv3.1-contrib/Dockerfile . &&docker run opencv3.1-contrib",
-    "build-opencv3.2-contrib": "docker build -t opencv3.2-contrib -f ./ci/opencv3.2-contrib/Dockerfile . &&docker run opencv3.2-contrib",
-    "build-opencv3.3": "docker build -t opencv3.3 -f ./ci/opencv3.3/Dockerfile . &&docker run opencv3.3",
-    "build-opencv3.3-contrib": "docker build -t opencv3.3-contrib -f ./ci/opencv3.3-contrib/Dockerfile . &&docker run opencv3.3-contrib",
-    "build-opencv3.4": "docker build -t opencv3.4 -f ./ci/opencv3.4/Dockerfile . &&docker run opencv3.4",
-    "build-opencv3.4-contrib": "docker build -t opencv3.4-contrib -f ./ci/opencv3.4-contrib/Dockerfile . &&docker run opencv3.4-contrib",
-    "build-opencv3.2-contrib-with-coverage": "docker build -t opencv3.2-contrib-with-coverage -f ./ci/opencv3.2-contrib-with-coverage/Dockerfile . &&docker run -v $PWD/ci/coverage-report:/test/coverage-report opencv3.2-contrib-with-coverage"
+    "build-debug": "node-gyp rebuild --debug"
   },
   "gypfile": true,
   "dependencies": {