Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Update travis build #123

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
os: linux
dist: xenial
dist: trusty
language: node_js
node_js:
- "10"
Expand All @@ -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
Expand Down
7 changes: 0 additions & 7 deletions test/image-util-e2e-specs.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
5 changes: 0 additions & 5 deletions test/mjpeg-e2e-specs.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand Down