diff --git a/.travis.yml b/.travis.yml index bef74968..85756a20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ os: linux -dist: xenial +dist: trusty language: node_js node_js: - "10" @@ -15,16 +15,8 @@ env: - CXX=clang++-5.0 - CC=clang-5.0 install: - # on node 12 opencv4nodejs and mjpeg-consumer cannot be installed - - if [[ `node --version` != v12* ]]; then - printf "while [ true ]; do\nsleep 30\necho 'Building OpenCV'\ndone" > ping.sh; - bash ping.sh & - echo $! > ping.pid; - npm i opencv4nodejs > /dev/null 2>&1; - kill `cat ping.pid`; - - npm install --no-save mjpeg-consumer; - fi + - npm install --no-save opencv4nodejs; + - npm install --no-save mjpeg-consumer; - npm install script: - npm run test && npm run e2e-test diff --git a/test/image-util-e2e-specs.js b/test/image-util-e2e-specs.js index cb909339..0a46627c 100644 --- a/test/image-util-e2e-specs.js +++ b/test/image-util-e2e-specs.js @@ -18,13 +18,6 @@ async function getImage (name) { } describe('image-util', function () { - before(function () { - // TODO: remove when opencv4nodejs can handle v12 - if (process.version.startsWith('v12')) { - return this.skip(); - } - }); - describe('cropBase64Image', function () { let originalImage = null; diff --git a/test/mjpeg-e2e-specs.js b/test/mjpeg-e2e-specs.js index 9fbdbcf7..99d97026 100644 --- a/test/mjpeg-e2e-specs.js +++ b/test/mjpeg-e2e-specs.js @@ -16,11 +16,6 @@ describe('MJpeg Stream (e2e)', function () { let mJpegServer, stream; before(function () { - // TODO: remove when buffertools can handle v12 - if (process.version.startsWith('v12')) { - return this.skip(); - } - mJpegServer = initMJpegServer(MJPEG_SERVER_PORT); });