Skip to content

Commit

Permalink
alt workaround for nodejs/node-gyp#972 since npm-windows-upgrade brok…
Browse files Browse the repository at this point in the history
…e node v0.10.x support
  • Loading branch information
Dane Springmeyer committed Aug 4, 2017
1 parent 4aaea74 commit 636a6d9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"node-pre-gyp"
],
"devDependencies": {
"node-gyp": "^3.6.1",
"aws-sdk": "2.x",
"eslint": "3.5.0",
"mocha": "3.x"
Expand Down
7 changes: 0 additions & 7 deletions scripts/build-appveyor.bat
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@ IF %NODE_MAJOR% GTR 0 ECHO node version greater than zero, not updating npm && G

powershell Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
CALL npm install --global --production npm-windows-upgrade
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
REM https://ci.appveyor.com/project/Mapbox/node-sqlite3/build/1.0.500/job/n2y9fo4eg316db56#L289
REM error C2373: '__pfnDliNotifyHook2': redefinition; different type modifiers
REM at least 2.15.9 is needed: https://github.com/nodejs/node-gyp/issues/972#issuecomment-231055109
CALL npm-windows-upgrade --npm-version 2.15.9 --no-dns-check --no-prompt
IF %ERRORLEVEL% NEQ 0 GOTO ERROR

:SKIP_APPVEYOR_INSTALL
IF /I "%msvs_toolset%"=="12" GOTO NODE_INSTALLED
Expand Down

0 comments on commit 636a6d9

Please sign in to comment.