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

Commit ae01cf6

Browse files
author
Simon Hofmann
committed
Updated build scripts
1 parent b0c478e commit ae01cf6

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

.travis.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ sudo: required
77
services:
88
- docker
99

10-
env:
11-
global:
12-
- OPENCV4NODEJS_DISABLE_AUTOBUILD=1
13-
1410
matrix:
1511
include:
1612
# - os: linux
@@ -76,9 +72,3 @@ script:
7672
cd ./ci/$BUILD_TASK;
7773
npm run $BUILD_TASK $TAG;
7874
fi
79-
80-
after_success:
81-
- if [ $BUILD_TASK = 'cover' ]; then
82-
npm install;
83-
npm run codecov -- -t $CODECOV_TOKEN;
84-
fi

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ environment:
4242
DISABLE_ASYNC_HOOKS_TEST: 1
4343

4444
install:
45+
- IF EXIST c:\opencv-prebuilt RMDIR /S /Q c:\opencv-prebuilt
4546
# - cmd: choco install OpenCV -y -version %OPENCV_VERSION%
4647
- IF EXIST c:\tools\opencv* CD c:\tools\opencv*
4748
- SET OPENCV_INCLUDE_DIR=%CD%\build\include

ci/prebuild/prebuild.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
#!/bin/sh
2-
if [[ "$TRAVIS_OS_NAME" == "linux" ]];
2+
if [[ "$TRAVIS_OS_NAME" == "linux" ]] || [[ "$TRAVIS_OS_NAME" == "osx" ]];
33
then
4-
unset OPENCV4NODEJS_DISABLE_AUTOBUILD
4+
dirs=(
5+
/opt/opencv-prebuilt
6+
/usr/local/opt/opencv-prebuilt
7+
)
8+
9+
for dir in ${dirs[*]}; do if [ -d $dir ]; then rm -rf $dir; fi; done
510
fi
11+
if [[ "$TRAVIS_OS_NAME" == "windows" ]];
12+
then
13+
for dir in ${dirs[*]}; do if [ -d $dir ]; then rm -rf $dir; fi; done
14+
fi
15+
616
cd ../../ &&\
717
npm install --unsafe-perm &&\
818
npm test

0 commit comments

Comments
 (0)