Skip to content

Commit

Permalink
Removing remaining remnants of node v0 support
Browse files Browse the repository at this point in the history
  • Loading branch information
bbyars committed Dec 6, 2016
1 parent 48b1633 commit a6e759c
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 17 deletions.
4 changes: 0 additions & 4 deletions build.bat
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
@echo off

REM For node v0.12 and below, the jsdom installation included in npm install requires
REM python 2.7, and probably some other build tools, to install correctly on Windows
REM For node v4, jsdom requires no native dependencies

REM I want to test x86 and x64 zip files, but no need to retest default grunt task
REM on x86. Appveyor doesn't give me an elegant way to explicitly define the matrix,
REM so we'll just shortcut those nodes in the matrix
Expand Down
13 changes: 2 additions & 11 deletions scripts/dist/createWindowsZip
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ set -e

ARCH=$1
MB_VERSION=$2
NODE_MAJOR_VERSION=`node -v | sed -E -e 's/(v[0-9]+)\.[0-9]+\.[0-9]+/\1/'`

cd dist

Expand All @@ -14,17 +13,9 @@ NODE_VERSION=`node -v`
MB_FILENAME=mountebank-v$MB_VERSION-win-$ARCH

if [ "$ARCH" = 'x86' ]; then
if [ "$NODE_MAJOR_VERSION" = 'v0' ]; then
URL=https://nodejs.org/dist/$NODE_VERSION/node.exe
else
URL=https://nodejs.org/dist/$NODE_VERSION/win-x86/node.exe
fi
URL=https://nodejs.org/dist/$NODE_VERSION/win-x86/node.exe
else
if [ "$NODE_MAJOR_VERSION" = 'v0' ]; then
URL=https://nodejs.org/dist/$NODE_VERSION/x64/node.exe
else
URL=https://nodejs.org/dist/$NODE_VERSION/win-x64/node.exe
fi
URL=https://nodejs.org/dist/$NODE_VERSION/win-x64/node.exe
fi

[ -e $MB_FILENAME ] && rm -rf $MB_FILENAME
Expand Down
2 changes: 1 addition & 1 deletion src/views/docs/api/contracts/config.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"debug": true
},</span>
<span id='config-process'><%- indent(2) %>&quot;process&quot;: {</span>
<span id='config-process-nodeVersion'><%- indent(4) %>&quot;nodeVersion&quot;: &quot;v0.10.21&quot;,</span>
<span id='config-process-nodeVersion'><%- indent(4) %>&quot;nodeVersion&quot;: &quot;v6.9.1&quot;,</span>
<span id='config-process-architecture'><%- indent(4) %>&quot;architecture&quot;: &quot;x64&quot;,
&quot;platform&quot;: &quot;darwin&quot;,</span>
<span id='config-process-memory'><%- indent(4) %>&quot;rss&quot;: 29822976,
Expand Down
1 change: 0 additions & 1 deletion test/models/abstractServerTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ describe('AbstractServer', function () {
baseServer.listeners('request')[0](socket, {}, function () {
logger.debug.assertLogged('[test:3000] host:port => "full request"');
});
// The delay is not needed in node v0.10; evidently it came on a later process tick in subsequent versions
return Q.delay(1);
});
});
Expand Down

0 comments on commit a6e759c

Please sign in to comment.