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

Commit 8cda684

Browse files
author
Simon Hofmann
committed
Enabled prebuilt releases
1 parent c00a7c7 commit 8cda684

File tree

5 files changed

+1912
-22
lines changed

5 files changed

+1912
-22
lines changed

‎.travis.yml‎

Lines changed: 80 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
language: node_js
22

3+
sudo: required
4+
5+
services:
6+
- docker
7+
38
node_js:
49
- '6'
10+
- '7'
511
- '8'
12+
- '9'
613
- '10'
714
- 'node'
815

9-
sudo: required
10-
11-
services:
12-
- docker
13-
1416
env:
17+
global:
18+
- OPENCV4NODEJS_DISABLE_AUTOBUILD=1
19+
matrix:
1520
- BUILD_TASK=test
1621
TAG=3.0.0-contrib
1722
- BUILD_TASK=test
@@ -20,8 +25,6 @@ env:
2025
TAG=3.2.0-contrib
2126
- BUILD_TASK=test
2227
TAG=3.3.0-contrib
23-
- BUILD_TASK=cover
24-
TAG=3.4.0-contrib
2528
- BUILD_TASK=test
2629
TAG=3.4.0-contrib-world
2730
- BUILD_TASK=test
@@ -32,17 +35,83 @@ env:
3235
TAG=3.4.3
3336
- BUILD_TASK=test
3437
TAG=3.4.3-contrib
38+
- BUILD_TASK=prebuild
39+
TAG=3.4.3-contrib
40+
- BUILD_TASK=cover
41+
TAG=3.4.3-contrib
42+
43+
matrix:
44+
include:
45+
- os: osx
46+
node_js: '6'
47+
env:
48+
- BUILD_TASK=test
49+
- os: osx
50+
node_js: '6'
51+
env:
52+
- BUILD_TASK=prebuild
53+
- os: osx
54+
node_js: '7'
55+
env:
56+
- BUILD_TASK=test
57+
- os: osx
58+
node_js: '7'
59+
env:
60+
- BUILD_TASK=prebuild
61+
- os: osx
62+
node_js: '8'
63+
env:
64+
- BUILD_TASK=test
65+
- os: osx
66+
node_js: '8'
67+
env:
68+
- BUILD_TASK=prebuild
69+
- os: osx
70+
node_js: '9'
71+
env:
72+
- BUILD_TASK=test
73+
- os: osx
74+
node_js: '9'
75+
env:
76+
- BUILD_TASK=prebuild
77+
- os: osx
78+
node_js: '10'
79+
env:
80+
- BUILD_TASK=test
81+
- os: osx
82+
node_js: '10'
83+
env:
84+
- BUILD_TASK=prebuild
85+
- os: osx
86+
node_js: 'node'
87+
env:
88+
- BUILD_TASK=test
89+
- os: osx
90+
node_js: 'node'
91+
env:
92+
- BUILD_TASK=prebuild
3593

3694
before_install:
37-
- chmod +x ./ci/$BUILD_TASK/$BUILD_TASK.sh
95+
- if [[ $BUILD_TASK != "prebuild" ]]; then
96+
chmod +x ./ci/$BUILD_TASK/$BUILD_TASK.sh;
97+
fi
3898

39-
install: travis_wait 30 docker pull justadudewhohacks/opencv4nodejs-ci:$TAG
99+
install:
100+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then travis_wait 30 docker pull justadudewhohacks/opencv4nodejs-ci:$TAG; fi
101+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install opencv@3; brew link --force opencv@3; fi
40102

41103
script:
42-
- cd ./ci/$BUILD_TASK
43-
- npm run $BUILD_TASK $TAG
104+
- if [[ $BUILD_TASK != "prebuild" ]]; then
105+
cd ./ci/$BUILD_TASK;
106+
npm run $BUILD_TASK $TAG;
107+
cd -;
108+
fi
44109

45110
after_success:
111+
- if [[ $TRAVIS_TAG != "" && $BUILD_TASK == "prebuild" ]]; then
112+
npm install;
113+
npm run prebuild -- -u $GITHUB_TOKEN;
114+
fi
46115
- if [ $BUILD_TASK = 'cover' ]; then
47116
npm install;
48117
npm run codecov -- -t $CODECOV_TOKEN;

‎appveyor.yml‎

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,49 @@ init:
1818
# what combinations to test
1919
environment:
2020
matrix:
21+
# node 11
22+
- nodejs_version: 11
23+
PYTHON: "C:\\Python27-x64"
24+
PYTHON_VERSION: "2.7"
25+
opencv_version: 3.4.3
26+
# use self build
27+
OPENCV4NODEJS_DISABLE_AUTOBUILD: 1
28+
# node 10
29+
- nodejs_version: 10
30+
PYTHON: "C:\\Python27-x64"
31+
PYTHON_VERSION: "2.7"
32+
opencv_version: 3.4.3
33+
# use self build
34+
OPENCV4NODEJS_DISABLE_AUTOBUILD: 1
2135
# node 9
2236
- nodejs_version: 9
2337
PYTHON: "C:\\Python27-x64"
2438
PYTHON_VERSION: "2.7"
25-
opencv_version: 3.3.0
39+
opencv_version: 3.4.3
40+
# use self build
41+
OPENCV4NODEJS_DISABLE_AUTOBUILD: 1
42+
# node 8
43+
- nodejs_version: 8
44+
PYTHON: "C:\\Python27-x64"
45+
PYTHON_VERSION: "2.7"
46+
opencv_version: 3.4.3
47+
# use self build
48+
OPENCV4NODEJS_DISABLE_AUTOBUILD: 1
49+
# node 7
50+
- nodejs_version: 7
51+
PYTHON: "C:\\Python27-x64"
52+
PYTHON_VERSION: "2.7"
53+
opencv_version: 3.4.3
2654
# use self build
2755
OPENCV4NODEJS_DISABLE_AUTOBUILD: 1
2856
# node 6
2957
- nodejs_version: 6
3058
PYTHON: "C:\\Python27-x64"
3159
PYTHON_VERSION: "2.7"
32-
opencv_version: 3.3.0
60+
opencv_version: 3.4.3
3361
# use self build
3462
OPENCV4NODEJS_DISABLE_AUTOBUILD: 1
3563

36-
3764
install:
3865
- cmd: choco install OpenCV -y -version %OPENCV_VERSION%
3966
- IF EXIST c:\tools\opencv* CD c:\tools\opencv*
@@ -55,4 +82,10 @@ test_script:
5582
- cmd: cd c:\projects\opencv4nodejs\test
5683
- npm install
5784
- npm run test-appveyor
58-
- npm run test-externalMemTracking
85+
- npm run test-externalMemTracking
86+
87+
on_success:
88+
- cmd: cd c:\projects\opencv4nodejs
89+
- IF defined APPVEYOR_REPO_TAG_NAME (
90+
npm run prebuild -- -u %GITHUB_TOKEN%
91+
)

‎ci/test/test.sh‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
#!/bin/sh
2-
image=opencv4nodejs-ci_$1
3-
docker build -t $image -f ./Dockerfile --build-arg TAG=$1 ../../
4-
docker run $image
2+
if [[ "$TRAVIS_OS_NAME" == "linux" ]];
3+
then
4+
image=opencv4nodejs-ci_$1
5+
docker build -t $image -f ./Dockerfile --build-arg TAG=$1 ../../
6+
docker run $image
7+
elif [[ "$TRAVIS_OS_NAME" == "osx" ]];
8+
then
9+
cd ../../test &&\
10+
npm install --unsafe-perm &&\
11+
npm run test-appveyor &&\
12+
npm run test-externalMemTracking
13+
fi

0 commit comments

Comments
 (0)