Commit 9dc5417e by Dane Springmeyer

appveyor: os is only respected at top-level

parent e9512b43
...@@ -17,7 +17,6 @@ environment: ...@@ -17,7 +17,6 @@ environment:
PLATFORM: x64 PLATFORM: x64
msvs_toolset: 14 msvs_toolset: 14
TOOLSET_ARGS: --toolset=v140 --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11/ TOOLSET_ARGS: --toolset=v140 --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11/
os: Visual Studio 2014 CTP4
- nodejs_version: 0.11.13 - nodejs_version: 0.11.13
nw_version: 0.10.5 nw_version: 0.10.5
PLATFORM: x86 PLATFORM: x86
...@@ -27,6 +26,8 @@ environment: ...@@ -27,6 +26,8 @@ environment:
PLATFORM: x64 PLATFORM: x64
msvs_toolset: 12 msvs_toolset: 12
os: Visual Studio 2014 CTP4
install: install:
- node -v - node -v
- npm -v - npm -v
...@@ -40,9 +41,10 @@ install: ...@@ -40,9 +41,10 @@ install:
- if "%msvs_toolset%" == "12" powershell Install-Product node $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:Platform/node.exe" - if "%msvs_toolset%" == "14" powershell Write-Output "fetching https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/$env:Platform/node.exe"
- if "%msvs_toolset%" == "14" powershell Start-FileDownload "https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/$env:Platform/node.exe" - if "%msvs_toolset%" == "14" powershell Start-FileDownload "https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/$env:Platform/node.exe"
- if "%msvs_toolset%" == "14" powershell Write-Output "https://mapbox.s3.amazonaws.com/node-cpp11/vcredist_$env:Platform.exe" # only needed if not using 'os: Visual Studio 2014 CTP4'
- if "%msvs_toolset%" == "14" powershell Start-FileDownload "https://mapbox.s3.amazonaws.com/node-cpp11/vcredist_$env:Platform.exe" #- if "%msvs_toolset%" == "14" powershell Write-Output "https://mapbox.s3.amazonaws.com/node-cpp11/vcredist_$env:Platform.exe"
- if "%msvs_toolset%" == "14" .\vcredist_%platform%.exe /q /norestart #- if "%msvs_toolset%" == "14" powershell Start-FileDownload "https://mapbox.s3.amazonaws.com/node-cpp11/vcredist_$env:Platform.exe"
#- if "%msvs_toolset%" == "14" .\vcredist_%platform%.exe /q /norestart
- node -v - node -v
- node -e "console.log(process.argv)" - node -e "console.log(process.argv)"
- npm -v - npm -v
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment