From 598ab9aa6169af39c19538976d74decbd5394a91 Mon Sep 17 00:00:00 2001 From: legendecas Date: Wed, 4 Sep 2019 14:32:53 +0800 Subject: [PATCH 1/2] test: remove unnecessary NAPI_EXPERIMENTAL --- test/basic_types/array.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/test/basic_types/array.cc b/test/basic_types/array.cc index 401d93618..fb0074c40 100644 --- a/test/basic_types/array.cc +++ b/test/basic_types/array.cc @@ -1,4 +1,3 @@ -#define NAPI_EXPERIMENTAL #include "napi.h" using namespace Napi; From 64d87eecd2797383b427470e1b21b9ae730a3a49 Mon Sep 17 00:00:00 2001 From: legendecas Date: Wed, 4 Sep 2019 14:33:25 +0800 Subject: [PATCH 2/2] travis: remove chakracore on travis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. node-chakracore v8 doesn’t expose napi version 2. node-chakracore v10 doesn’t throws on handlescope double escape 3. set npm_config_NAPI_VERSION to override NAPI_EXPERIMENTAL expansion on Node.js version lower than 11 for napi_date_* not back ported to v10 --- .travis.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7821a7223..dda1e2cf7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,20 +12,15 @@ env: # https://github.com/jasongin/nvs/blob/master/doc/CI.md - NVS_VERSION=1.4.2 matrix: - - NODEJS_VERSION=node/4 - NODEJS_VERSION=node/6 - NODEJS_VERSION=node/8 - - NODEJS_VERSION=node/9 - NODEJS_VERSION=node/10 - - NODEJS_VERSION=chakracore/8 - - NODEJS_VERSION=chakracore/10 + - NODEJS_VERSION=node/12 - NODEJS_VERSION=nightly - - NODEJS_VERSION=chakracore-nightly matrix: fast_finish: true allow_failures: - env: NODEJS_VERSION=nightly - - env: NODEJS_VERSION=chakracore-nightly sudo: false cache: directories: @@ -59,7 +54,13 @@ install: script: # Travis CI sets NVM_NODEJS_ORG_MIRROR, but it makes node-gyp fail to download headers for nightly builds. - unset NVM_NODEJS_ORG_MIRROR + - NODEJS_MAJOR_VERSION=$(node -p "process.versions.node.match(/\d+/)[0]") - - npm test $NPMOPT + - | + if [ ${NODEJS_MAJOR_VERSION} -gt 11 ]; then + npm test + else + npm test $NPMOPT --NAPI_VERSION=$(node -p "process.versions.napi") + fi after_success: - cpp-coveralls --gcov-options '\-lp' --build-root test/build --exclude test