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

Commit b0543dd

Browse files
author
Simon Hofmann
committed
Latest version of prebuild setup
1 parent c00a7c7 commit b0543dd

File tree

7 files changed

+1953
-45
lines changed

7 files changed

+1953
-45
lines changed

‎.travis.yml‎

Lines changed: 98 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,118 @@
11
language: node_js
22

3-
node_js:
4-
- '6'
5-
- '8'
6-
- '10'
7-
- 'node'
3+
cache: npm
84

95
sudo: required
106

117
services:
128
- docker
139

10+
node_js:
11+
- '6'
12+
- '7'
13+
- '8'
14+
- '9'
15+
- '10'
16+
- 'node'
17+
1418
env:
15-
- BUILD_TASK=test
16-
TAG=3.0.0-contrib
17-
- BUILD_TASK=test
18-
TAG=3.1.0-contrib
19-
- BUILD_TASK=test
20-
TAG=3.2.0-contrib
21-
- BUILD_TASK=test
22-
TAG=3.3.0-contrib
23-
- BUILD_TASK=cover
24-
TAG=3.4.0-contrib
25-
- BUILD_TASK=test
26-
TAG=3.4.0-contrib-world
27-
- BUILD_TASK=test
28-
TAG=3.4.1-contrib
29-
- BUILD_TASK=test
30-
TAG=3.4.2-contrib
31-
- BUILD_TASK=test
32-
TAG=3.4.3
33-
- BUILD_TASK=test
19+
global:
20+
- OPENCV4NODEJS_DISABLE_AUTOBUILD=1
21+
matrix:
22+
# - BUILD_TASK=test
23+
# TAG=3.0.0-contrib
24+
# - BUILD_TASK=test
25+
# TAG=3.1.0-contrib
26+
# - BUILD_TASK=test
27+
# TAG=3.2.0-contrib
28+
# - BUILD_TASK=test
29+
# TAG=3.3.0-contrib
30+
# - BUILD_TASK=test
31+
# TAG=3.4.0-contrib-world
32+
# - BUILD_TASK=test
33+
# TAG=3.4.1-contrib
34+
# - BUILD_TASK=test
35+
# TAG=3.4.2-contrib
36+
# - BUILD_TASK=test
37+
# TAG=3.4.3
38+
# - BUILD_TASK=test
39+
# TAG=3.4.3-contrib
40+
- BUILD_TASK=prebuild
3441
TAG=3.4.3-contrib
42+
# - BUILD_TASK=cover
43+
# TAG=3.4.3-contrib
44+
45+
matrix:
46+
include:
47+
# - os: osx
48+
# node_js: '6'
49+
# env:
50+
# - BUILD_TASK=test
51+
- os: osx
52+
node_js: '6'
53+
env:
54+
- BUILD_TASK=prebuild
55+
# - os: osx
56+
# node_js: '7'
57+
# env:
58+
# - BUILD_TASK=test
59+
- os: osx
60+
node_js: '7'
61+
env:
62+
- BUILD_TASK=prebuild
63+
# - os: osx
64+
# node_js: '8'
65+
# env:
66+
# - BUILD_TASK=test
67+
- os: osx
68+
node_js: '8'
69+
env:
70+
- BUILD_TASK=prebuild
71+
# - os: osx
72+
# node_js: '9'
73+
# env:
74+
# - BUILD_TASK=test
75+
- os: osx
76+
node_js: '9'
77+
env:
78+
- BUILD_TASK=prebuild
79+
# - os: osx
80+
# node_js: '10'
81+
# env:
82+
# - BUILD_TASK=test
83+
- os: osx
84+
node_js: '10'
85+
env:
86+
- BUILD_TASK=prebuild
87+
# - os: osx
88+
# node_js: 'node'
89+
# env:
90+
# - BUILD_TASK=test
91+
- os: osx
92+
node_js: 'node'
93+
env:
94+
- BUILD_TASK=prebuild
3595

3696
before_install:
37-
- chmod +x ./ci/$BUILD_TASK/$BUILD_TASK.sh
97+
- chmod +x ./ci/$BUILD_TASK/$BUILD_TASK.sh;
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+
cd ./ci/$BUILD_TASK;
113+
npm run $BUILD_TASK $TAG;
114+
cd -;
115+
fi
46116
- if [ $BUILD_TASK = 'cover' ]; then
47117
npm install;
48118
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 -- --tag-prefix "" -u %GITHUB_TOKEN%
91+
)

‎ci/prebuild/package.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"scripts": {
3+
"prebuild": "bash ./prebuild.sh"
4+
}
5+
}

‎ci/prebuild/prebuild.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
if [[ "$TRAVIS_OS_NAME" == "linux" ]];
3+
then
4+
unset OPENCV4NODEJS_DISABLE_AUTOBUILD
5+
fi
6+
cd ../../ &&\
7+
npm install --unsafe-perm &&\
8+
npm run prebuild -- --tag-prefix "" -u $GITHUB_TOKEN;

‎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)