summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--circle.yml61
-rw-r--r--cmake/node.cmake5
-rw-r--r--package.json2
3 files changed, 5 insertions, 63 deletions
diff --git a/circle.yml b/circle.yml
index de5a8ce74e..ae7c070d6f 100644
--- a/circle.yml
+++ b/circle.yml
@@ -24,10 +24,6 @@ workflows:
only: /android-v.*/
branches:
ignore: /.*/
- - node4-clang39-release:
- filters:
- tags:
- only: /node-.*/
- node6-clang39-release:
filters:
tags:
@@ -56,10 +52,6 @@ workflows:
ignore: /.*/
- macos-debug
- macos-debug-qt5
- - macos-release-node4:
- filters:
- tags:
- only: /node-.*/
- macos-release-node6:
filters:
tags:
@@ -166,13 +158,6 @@ step-library:
command: |
brew install cmake ccache
- - &install-macos-node4-dependencies
- run:
- name: Install macOS Node@4 dependencies
- command: |
- brew install node@4
- brew link node@4 --force --overwrite
-
- &install-macos-node6-dependencies
run:
name: Install macOS Node@6 dependencies
@@ -531,29 +516,6 @@ jobs:
# ------------------------------------------------------------------------------
- node4-clang39-release:
- docker:
- - image: mbgl/7d2403f42e:linux-clang-3.9-node-4
- working_directory: /src
- environment:
- LIBSYSCONFCPUS: 4
- JOBS: 4
- BUILDTYPE: RelWithDebInfo
- WITH_EGL: 1
- WITH_CXX11ABI: 0
- steps:
- - checkout
- - *generate-cache-key
- - *restore-cache
- - *reset-ccache-stats
- - *build-node
- - *show-ccache-stats
- - *save-cache
- - *run-node-linux-tests
- - *publish-node-package
- - *upload-render-tests
-
-# ------------------------------------------------------------------------------
node6-clang39-release:
docker:
- image: mbgl/7d2403f42e:linux-clang-3.9
@@ -994,29 +956,6 @@ jobs:
destination: test/fixtures
# ------------------------------------------------------------------------------
- macos-release-node4:
- macos:
- xcode: "9.4.0"
- environment:
- BUILDTYPE: RelWithDebInfo
- HOMEBREW_NO_AUTO_UPDATE: 1
- steps:
- - checkout
- - *install-macos-dependencies
- - *install-macos-node4-dependencies
- - *generate-cache-key
- - *restore-cache
- - *reset-ccache-stats
- - *build-node
- - *show-ccache-stats
- - *save-cache
- - *run-node-macos-tests
- - *publish-node-package
- - *upload-render-tests
- - *collect-xcode-build-logs
- - *upload-xcode-build-logs
-
-# ------------------------------------------------------------------------------
macos-release-node6:
macos:
xcode: "9.4.0"
diff --git a/cmake/node.cmake b/cmake/node.cmake
index b0fcdda1fc..5db1f46137 100644
--- a/cmake/node.cmake
+++ b/cmake/node.cmake
@@ -21,7 +21,10 @@ create_source_groups(mbgl-loop-node)
add_node_module(mbgl-node
INSTALL_PATH "lib/{node_abi}/mbgl.node"
NAN_VERSION "2.10.0"
- EXCLUDE_NODE_ABIS 47 51 59 # Don't build old beta ABIs 5.x, 7.x, and 9.x
+
+ # Don't build for Node 4.x, 5.x, 7.x, or 9.x
+ # See https://nodejs.org/en/download/releases/ for mapping of Node version to ABI number
+ EXCLUDE_NODE_ABIS 46 47 51 59
)
target_sources(mbgl-node INTERFACE
diff --git a/package.json b/package.json
index 196ace512b..33744376d1 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
"tape": "^4.5.1"
},
"engines": {
- "node": ">=4.2.1"
+ "node": ">=6"
},
"scripts": {
"preinstall": "npm install node-pre-gyp",