Merge branch 'master' of https://github.com/nodejs/nan into CPP17Asyn…

…cWorkers
nodejs · Mar 6, 2020 · 1026683 · 1026683
2 parents 0682be0 + 2c023bd
commit 1026683
Show file tree

Hide file tree

Showing 6 changed files with 545 additions and 156 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,9 +26,10 @@ env:
   - TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="2.0.18"
   - TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="3.1.13"
   - TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="4.2.12"
-  - TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="5.0.11"
-  - TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="6.1.2"
-  - TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="7.0.0"
+  - TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="5.0.13"
+  - TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="6.1.9"
+  - TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="7.1.14"
+  - TRAVIS_NODE_VERSION="lts/*" ELECTRON_VERSION="8.0.3"
 matrix:
   exclude:
     - os: osx

diff --git a/Makefile b/Makefile
@@ -84,7 +84,7 @@ LINT_SOURCES = \
 	test/cpp/wrappedobjectfactory.cpp \
 	node_modules/node-gyp/gyp/data/win/large-pdb-shim.cc
 
-FILTER = -whitespace/parens
+FILTER = -build/include_subdir,-whitespace/parens
 
 .PHONY: lint