Merge branch 'master' of https://github.com/grpc/grpc-node into nvm-ps

This commit is contained in:
Nicolas "Pixel" Noble 2018-03-16 22:24:17 +01:00
commit b363ea9bc7
3 changed files with 9 additions and 0 deletions

View File

@ -143,6 +143,11 @@ exports.load = function load(filename, format, options) {
} finally {
ProtoBuf.convertFieldsToCamelCase = convertFieldsToCamelCaseOriginal;
}
if (!builder) {
throw new Error('Could not load file "' + filename + '"');
}
return loadObject(builder.ns, options);
};

View File

@ -39,6 +39,8 @@ for %%v in (4 6 7 8) do (
mkdir reports\node%%v
SET JUNIT_REPORT_PATH=reports/node%%v
node -e "process.exit(process.version.startsWith('v%%v') ? 0 : -1)" || goto :error
call .\node_modules\.bin\gulp clean.all || SET FAILED=1
call .\node_modules\.bin\gulp setup.windows || SET FAILED=1
call .\node_modules\.bin\gulp native.test || SET FAILED=1

View File

@ -53,6 +53,8 @@ do
mkdir -p "reports/node$version"
node -e 'process.exit(process.version.startsWith("v'$version'") ? 0 : -1)'
# Install dependencies and link packages together.
./node_modules/.bin/gulp clean.all
./node_modules/.bin/gulp setup