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

Commit d660a7e

Browse files
author
Simon Hofmann
committed
Removed pre-installed opencv and several CI jobs
1 parent 32d2d8f commit d660a7e

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

.travis.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ matrix:
4949
env:
5050
- BUILD_TASK=test
5151
TAG=3.4.6-contrib-node10
52-
- os: linux
53-
env:
54-
- BUILD_TASK=cover
55-
TAG=3.4.6-contrib-node11
5652
- os: linux
5753
node_js: '6'
5854
env:
@@ -105,9 +101,7 @@ matrix:
105101
before_install:
106102
- chmod +x ./ci/$BUILD_TASK/$BUILD_TASK.sh;
107103

108-
install:
109-
- if [[ "$TRAVIS_OS_NAME" == "linux" && $TAG != "" ]]; then travis_wait 30 docker pull justadudewhohacks/opencv4nodejs-ci:$TAG; fi
110-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install opencv@3; brew link --force opencv@3; fi
104+
install: true
111105

112106
script:
113107
- if [[ $BUILD_TASK != "prebuild" ]]; then

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ environment:
4949
OPENCV4NODEJS_DISABLE_AUTOBUILD: 1
5050

5151
install:
52-
- cmd: choco install OpenCV -y -version %OPENCV_VERSION%
52+
# - cmd: choco install OpenCV -y -version %OPENCV_VERSION%
5353
- IF EXIST c:\tools\opencv* CD c:\tools\opencv*
5454
- SET OPENCV_INCLUDE_DIR=%CD%\build\include
5555
- SET OPENCV_LIB_DIR=%CD%\build\x64\vc14\lib

0 commit comments

Comments
 (0)