From 76f1e236961fdfa45de17a201bcbef207cdf4f71 Mon Sep 17 00:00:00 2001 From: Casey Foster Date: Tue, 30 Apr 2019 11:07:23 -0500 Subject: [PATCH] Support node 12 --- .circleci/config.yml | 89 +++++++++++++++++++++++++------------------- .travis.yml | 1 + appveyor.yml | 5 ++- package-lock.json | 6 +-- package.json | 2 +- 5 files changed, 60 insertions(+), 43 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9e3b1d65..2a45e9e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,43 +1,56 @@ version: 2 +workflows: + version: 2 + workflow: + jobs: + - node-8 + - node-10 + - node-12 + +defaults: &defaults + macos: + xcode: 10.2.0 + steps: + - checkout + - run: + name: install llvm + command: | + brew update + brew uninstall node yarn + brew cleanup + brew install llvm@7 node@$NODE_VERSION + echo "export PATH=${PATH}:/usr/local/opt/llvm@7/bin" >> $BASH_ENV + brew link --force --overwrite node@$NODE_VERSION + - run: npm install --build-from-source + - run: npm run ci:circle + - store_test_results: + path: test-results + - store_artifacts: + path: test-results + - run: + name: lint js + command: npm run lint:js + - run: + name: format c++ + command: npm run format && git diff --exit-code -- src/ test/ + - run: + name: lint c++ + command: npm run lint:cpp + - run: + name: deploy on tag + command: git describe --tags --exact >/dev/null 2>&1 && npm run pre-build -- -u ${NODE_PRE_GYP_GITHUB_TOKEN} || true + jobs: - build: - macos: - xcode: 8.3.3 + node-8: + <<: *defaults environment: - NODE_VERSION: "8" - steps: - - checkout - - run: - name: install llvm - command: | - brew update - brew install llvm - echo "export PATH=${PATH}:/usr/local/opt/llvm/bin" >> $BASH_ENV - - run: - name: install node.js with nvm - command: | - export NVM_DIR=${HOME}/.nvm - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash - [ -s "${NVM_DIR}/nvm.sh" ] && \. "${NVM_DIR}/nvm.sh" - nvm install ${NODE_VERSION} - nvm alias default ${NODE_VERSION} - echo "[ -s \"${NVM_DIR}/nvm.sh\" ] && . \"${NVM_DIR}/nvm.sh\"" >> $BASH_ENV - - run: npm install --build-from-source - - run: npm run ci:circle - - store_test_results: - path: test-results - - store_artifacts: - path: test-results - - run: - name: lint js - command: npm run lint:js - - run: - name: format c++ - command: npm run format && git diff --exit-code -- src/ test/ - - run: - name: lint c++ - command: npm run lint:cpp - - run: - name: deploy on tag - command: git describe --tags --exact >/dev/null 2>&1 && npm run pre-build -- -u ${NODE_PRE_GYP_GITHUB_TOKEN} || true + node-10: + <<: *defaults + environment: + - NODE_VERSION: "10" + node-12: + <<: *defaults + environment: + - NODE_VERSION: "12" diff --git a/.travis.yml b/.travis.yml index 7ed96dab..35e5d03b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: node_js node_js: - 8 - 10 +- 12 sudo: false dist: trusty addons: diff --git a/appveyor.yml b/appveyor.yml index 81a993f5..246a08ca 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,9 +5,12 @@ cache: - '%APPDATA%\npm-cache' environment: - nodejs_version: "8" NODE_PRE_GYP_GITHUB_TOKEN: secure: izXdqKc3Q97YCK/iHmkf5704WRhBwZXVBn2G+MX/NgyxVJPfwTkZxc8WMET/QZOh + matrix: + - nodejs_version: "8" + - nodejs_version: "10" + - nodejs_version: "11" platform: - x86 diff --git a/package-lock.json b/package-lock.json index cc53d523..97fa23cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3385,9 +3385,9 @@ "dev": true }, "nan": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.1.tgz", - "integrity": "sha512-I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA==" + "version": "2.13.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", + "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==" }, "nanomatch": { "version": "1.2.13", diff --git a/package.json b/package.json index e03bef37..cf1f8117 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "dependencies": { "event-kit": "2.5.3", "fs-extra": "7.0.1", - "nan": "2.13.1", + "nan": "2.13.2", "prebuild-install": "5.2.5" }, "standard": {