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

Feature/node 13 14 #1

Merged
merged 7 commits into from
Apr 28, 2020
Merged

Feature/node 13 14 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8fa170f
Added node v13 and v14 to Travis build config
s1hofmann Apr 28, 2020
f8b08de
Added node v13 and v14 to appveyor build config
s1hofmann Apr 28, 2020
be6027c
Version bump to 5.3.0-1
s1hofmann Apr 28, 2020
7c71d69
Version bump to 5.3.0-1
s1hofmann Apr 28, 2020
ebeb7ca
Reverte version bump
s1hofmann Apr 28, 2020
db7911c
Version bump to 5.3.0-1
s1hofmann Apr 28, 2020
87e9764
Removed macOS dependency to OpenCV build
s1hofmann Apr 28, 2020
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
32 changes: 32 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ matrix:
node_js: 12
env:
- BUILD_TASK=prebuild
- os: linux
node_js: 13
env:
- BUILD_TASK=test
- os: linux
node_js: 13
env:
- BUILD_TASK=prebuild
- os: linux
node_js: 14
env:
- BUILD_TASK=test
- os: linux
node_js: 14
env:
- BUILD_TASK=prebuild

- os: osx
node_js: 8
Expand Down Expand Up @@ -69,6 +85,22 @@ matrix:
node_js: 12
env:
- BUILD_TASK=prebuild
- os: osx
node_js: 13
env:
- BUILD_TASK=test
- os: osx
node_js: 13
env:
- BUILD_TASK=prebuild
- os: osx
node_js: 14
env:
- BUILD_TASK=test
- os: osx
node_js: 14
env:
- BUILD_TASK=prebuild

before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
Expand Down
4 changes: 4 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ environment:
PYTHON: "C:\\Python27-x64"

matrix:
- nodejs_version: 14
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- nodejs_version: 13
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- nodejs_version: 12
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- nodejs_version: 11
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opencv4nodejs-prebuilt",
"version": "5.3.0",
"version": "5.3.0-1",
"description": "Asynchronous OpenCV 3.x nodejs bindings with JavaScript and TypeScript API.",
"keywords": [
"opencv",
Expand Down