From 05310c10604de90411d559967830cbca332a0606 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Mon, 13 Jul 2015 19:08:56 -0700 Subject: [PATCH 1/2] Run msvs_toolset: 12 only --- appveyor.yml | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 82a8058d5..ac78143f7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,44 +7,6 @@ environment: - nodejs_version: 0.10.36 platform: x86 msvs_toolset: 12 - - nodejs_version: 0.10.36 - platform: x64 - msvs_toolset: 12 - - nodejs_version: 0.12.0 - platform: x86 - msvs_toolset: 12 - - nodejs_version: 0.12.0 - platform: x64 - msvs_toolset: 12 - - nodejs_version: 1.8.1 - platform: x86 - msvs_toolset: 12 - - nodejs_version: 1.8.1 - platform: x64 - msvs_toolset: 12 - - nodejs_version: 2.0.0 - platform: x64 - msvs_toolset: 12 - - nodejs_version: 2.0.0 - platform: x86 - msvs_toolset: 12 - # custom visual studio 2014 builds - - nodejs_version: 0.10.33 - platform: x86 - msvs_toolset: 14 - BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140 - - nodejs_version: 0.10.33 - platform: x64 - msvs_toolset: 14 - BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140 - - nodejs_version: 0.12.0 - platform: x86 - msvs_toolset: 14 - BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140 - - nodejs_version: 0.12.0 - platform: x64 - msvs_toolset: 14 - BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140 os: Visual Studio 2014 CTP4 From 21244c192184cf4b8e9dbc07dc03d5ab6880ab58 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Mon, 13 Jul 2015 19:16:49 -0700 Subject: [PATCH 2/2] Install-Product node --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ac78143f7..b2565c712 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,7 @@ install: - SET ARCHPATH= - if %platform% == x64 (SET ARCHPATH=x64/) # install node version per visual studio toolset - - if "%msvs_toolset%" == "12" powershell Update-NodeJsInstallation $env:nodejs_version $env:platform + - if "%msvs_toolset%" == "12" powershell Install-Product node $env:nodejs_version $env:platform - if "%msvs_toolset%" == "14" powershell Write-Output "fetching https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/${env:ARCHPATH}node.exe" - if "%msvs_toolset%" == "14" powershell Start-FileDownload "https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/${env:ARCHPATH}node.exe" # only needed if not using 'os: Visual Studio 2014 CTP4'