From 68226340314f68fe1e5a34a3ea2f04257fe931fe Mon Sep 17 00:00:00 2001 From: Maximiliano Korp Date: Wed, 14 Sep 2016 11:16:12 -0700 Subject: [PATCH 1/2] Fix windows builds where node exports openssl --- generate/templates/templates/binding.gyp | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp index dbc60874a..ccf254965 100644 --- a/generate/templates/templates/binding.gyp +++ b/generate/templates/templates/binding.gyp @@ -77,7 +77,27 @@ ], "defines": [ "_HAS_EXCEPTIONS=1" - ] + ], + "configurations": { + "Debug": { + "msvs_settings": { + "VCLinkerTool": { + "AdditionalOptions": [ + "/FORCE:MULTIPLE" + ] + } + } + }, + "Release": { + "msvs_settings": { + "VCLinkerTool": { + "AdditionalOptions": [ + "/FORCE:MULTIPLE" + ] + } + } + } + } } ], [ "OS=='linux' and ' Date: Wed, 14 Sep 2016 13:06:47 -0700 Subject: [PATCH 2/2] update versions of node for CI --- .travis.yml | 12 ++++++------ appveyor.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4b861349..d65107654 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,9 @@ sudo: false env: matrix: - export NODE_VERSION="0.12" TARGET_ARCH="x64" - - export NODE_VERSION="4.1" TARGET_ARCH="x64" - - export NODE_VERSION="5.8" TARGET_ARCH="x64" - - export NODE_VERSION="6" TARGET_ARCH="x64" + - export NODE_VERSION="4.5" TARGET_ARCH="x64" + - export NODE_VERSION="5.12" TARGET_ARCH="x64" + - export NODE_VERSION="6.5" TARGET_ARCH="x64" matrix: fast_finish: true @@ -25,13 +25,13 @@ matrix: env: export NODE_VERSION="0.12" TARGET_ARCH="ia32" sudo: required - os: linux - env: export NODE_VERSION="4.1" TARGET_ARCH="ia32" + env: export NODE_VERSION="4.5" TARGET_ARCH="ia32" sudo: required - os: linux - env: export NODE_VERSION="5.8" TARGET_ARCH="ia32" + env: export NODE_VERSION="5.12" TARGET_ARCH="ia32" sudo: required - os: linux - env: export NODE_VERSION="6.2" TARGET_ARCH="ia32" + env: export NODE_VERSION="6.5" TARGET_ARCH="ia32" sudo: required git: diff --git a/appveyor.yml b/appveyor.yml index 8fc6cd256..da168034d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,9 +28,9 @@ environment: matrix: # Node.js - nodejs_version: "0.12" - - nodejs_version: "4.1" - - nodejs_version: "5.8" - - nodejs_version: "6.2" + - nodejs_version: "4.5" + - nodejs_version: "5.12" + - nodejs_version: "6.5" matrix: fast_finish: true