grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into native_boringssl_build_fix

This commit is contained in:
murgatroid99 2017-09-25 13:52:48 -07:00
parent 69092117de 12067cce82
commit 1afa6dd371
12 changed files with 184 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gulpfile.js
View File

@ -14,6 +14,9 @@ const root = __dirname;
gulp.task('install.all', 'Install dependencies for all subdirectory packages',
['js.core.install', 'native.core.install', 'health-check.install']);
gulp.task('install.all.windows', 'Install dependencies for all subdirectory packages for MS Windows',
['js.core.install', 'native.core.install.windows', 'health-check.install']);
gulp.task('lint', 'Emit linting errors in source and test files',
['js.core.lint', 'native.core.lint']);
@ -30,7 +33,12 @@ gulp.task('link', 'Link local packages together after building',
gulp.start('link.only');
});
gulp.task('setup', 'One-time setup for a clean repository', ['install.all', 'link']);
gulp.task('setup', 'One-time setup for a clean repository', ['install.all'], () => {
gulp.start('link');
});
gulp.task('setup.windows', 'One-time setup for a clean repository for MS Windows', ['install.all.windows'], () => {
gulp.start('link');
});
gulp.task('clean', 'Delete generated files', ['js.core.clean', 'native.core.clean']);

26
install-nvm-windows.ps1 Normal file
View File

@ -0,0 +1,26 @@
# Copyright 2017 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# We're going to store nvm-windows in the .\nvm directory.
$env:NVM_HOME = (Get-Item -Path ".\" -Verbose).FullName + "\nvm"
# Downloading and unpacking nvm-windows
Invoke-WebRequest -Uri https://github.com/coreybutler/nvm-windows/releases/download/1.1.5/nvm-noinstall.zip -OutFile nvm-noinstall.zip
Add-Type -AssemblyName System.IO.Compression.FileSystem
[System.IO.Compression.ZipFile]::ExtractToDirectory("nvm-noinstall.zip", "nvm")
$env:Path = $env:NVM_HOME + ";" + $env:Path
Out-File -Encoding "OEM" nvm\settings.txt
nvm root $env:NVM_HOME
"%*" | Out-File -Encoding "OEM" nvm\elevate.cmd

22
kokoro.bat Normal file
View File

@ -0,0 +1,22 @@
@rem Copyright 2017 gRPC authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@echo "Starting Windows test"
cd /d %~dp0
git submodule update --init
git submodule foreach --recursive git submodule update --init
.\run-tests.bat

38
merge_kokoro_logs.js Normal file
View File

@ -0,0 +1,38 @@
const xml2js = require('xml2js');
const fs = require('fs');
const path = require('path');
const util = require('util');
const readFile = util.promisify(fs.readFile);
const writeFile = util.promisify(fs.writeFile);
const readDir = util.promisify(fs.readdir);
const rootDir = __dirname;
readDir(rootDir + '/reports')
.then((dirNames) =>
Promise.all(dirNames.map((dirName) =>
readDir(path.resolve(rootDir, 'reports', dirName))
.then((fileNames) =>
Promise.all(fileNames.map((name) =>
readFile(path.resolve(rootDir, 'reports', dirName, name))
.then((content) => {
let parser = new xml2js.Parser();
const parseString = util.promisify(parser.parseString.bind(parser));
return parseString(content);
})
))
)
.then((objects) => {
let merged = objects[0];
merged.testsuites.testsuite = Array.prototype.concat.apply([], objects.map((obj) => obj.testsuites.testsuite));
let builder = new xml2js.Builder();
let xml = builder.buildObject(merged);
let resultName = path.resolve(rootDir, 'reports', dirName, 'sponge_log.xml');
console.log(`Writing ${resultName}`);
return writeFile(resultName, xml);
})
))
)
.catch((error) => {
console.error(error);
});

3
package.json
View File

@ -33,7 +33,8 @@
"mocha": "^3.5.3",
"through2": "^2.0.3",
"tslint": "^5.5.0",
"typescript": "^2.5.1"
"typescript": "^2.5.1",
"xml2js": "^0.4.19"
},
"contributors": [
{

13
packages/grpc-native-core/gulpfile.js
View File

@ -30,7 +30,16 @@ gulp.task('native.core.install', 'Install native core dependencies', () => {
{cwd: nativeCoreDir, stdio: 'inherit'});
});
gulp.task('native.core.link.create', 'Create npm link', ['native.core.install'], () => {
gulp.task('native.core.install.windows', 'Install native core dependencies for MS Windows', () => {
return execa('npm', ['install', '--build-from-source'],
{cwd: nativeCoreDir, stdio: 'inherit'}).catch(() =>
del(path.resolve(process.env.USERPROFILE, '.node-gyp', process.versions.node, 'include/node/openssl'), { force: true }).then(() =>
execa('npm', ['install', '--build-from-source'],
{cwd: nativeCoreDir, stdio: 'inherit'})
))
});
gulp.task('native.core.link.create', 'Create npm link', () => {
return execa('npm', ['link'], {cwd: nativeCoreDir, stdio: 'inherit'});
});
@ -41,7 +50,7 @@ gulp.task('native.core.lint', 'Emits linting errors', () => {
});
gulp.task('native.core.build', 'Build native package', () => {
return execa('node-pre-gyp', ['build'], {cwd: nativeCoreDir, stdio: 'inherit'});
return execa('npm', ['run', 'build'], {cwd: nativeCoreDir, stdio: 'inherit'});
});
gulp.task('native.core.test', 'Run all tests', ['native.core.build'], () => {

1
packages/grpc-native-core/package.json
View File

@ -21,6 +21,7 @@
"scripts": {
"lint": "node ./node_modules/jshint/bin/jshint src test index.js --exclude-path=.jshintignore",
"test": "./node_modules/.bin/mocha test && npm run-script lint",
"build": "./node_modules/.bin/node-pre-gyp build",
"electron-build": "./node_modules/.bin/node-pre-gyp configure build --runtime=electron --disturl=https://atom.io/download/atom-shell",
"gen_docs": "./node_modules/.bin/jsdoc -c jsdoc_conf.json",
"coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha test",

46
run-tests.bat Normal file
View File

@ -0,0 +1,46 @@
@rem Copyright 2017 gRPC authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
SET ROOT=%~dp0
cd /d %~dp0
PowerShell -Command .\install-nvm-windows.ps1
SET NVM_HOME=%ROOT%nvm
SET NVM_SYMLINK=%ROOT%nvm\nodejs
SET PATH=%NVM_HOME%;%NVM_SYMLINK%;%PATH%
nvm version
nvm install 8.5.0
nvm use 8.5.0
call npm install || goto :error
for %%v in (4.8.4 6.11.3 7.9.0 8.5.0) do (
nvm install %%v
nvm use %%v
node -e "console.log(process.versions)"
call .\node_modules\.bin\gulp clean.all || goto :error
call .\node_modules\.bin\gulp setup.windows || goto :error
call .\node_modules\.bin\gulp native.test || goto :error
)
if %errorlevel% neq 0 exit /b %errorlevel%
goto :EOF
:error
exit /b 1

15
run-tests.sh
View File

@ -30,12 +30,12 @@ if [ ! -n "$node_versions" ] ; then
fi
set +ex
nvm install 8
nvm install lts/*
nvm use lts/*
set -ex
npm install --unsafe-perm
./node_modules/.bin/gulp setup
mkdir -p reports
@ -43,7 +43,6 @@ mkdir -p reports
for version in ${node_versions}
do
cd $ROOT
# Install and setup node for the version we want.
set +ex
echo "Switching to node version $version"
@ -55,16 +54,18 @@ do
# Install dependencies and link packages together.
./node_modules/.bin/gulp clean.all
./node_modules/.bin/gulp link
./node_modules/.bin/gulp setup
# Rebuild libraries and run tests.
JUNIT_REPORT_PATH="reports/node$version/" JUNIT_REPORT_STACK=1 ./node_modules/.bin/gulp native.test || FAILED="true"
cd "reports/node$version"
for file in * ; do
mv $file $(echo $file | sed 's/\(.*\)\.xml/\1_sponge_log.xml/')
done
done
set +ex
nvm use 8
set -ex
node merge_kokoro_logs.js
if [ "$FAILED" != "" ]
then
exit 1

2
test/kokoro/linux.cfg
View File

@ -19,6 +19,6 @@ build_file: "grpc-node/kokoro.sh"
timeout_mins: 60
action {
define_artifacts {
regex: "github/grpc-node/reports/**"
regex: "github/grpc-node/reports/**/sponge_log.xml"
}
}

2
test/kokoro/macos.cfg
View File

@ -19,6 +19,6 @@ build_file: "grpc-node/kokoro.sh"
timeout_mins: 60
action {
define_artifacts {
regex: "github/grpc-node/reports/**"
regex: "github/grpc-node/reports/**/sponge_log.xml"
}
}

19
test/kokoro/windows.cfg Normal file
View File

@ -0,0 +1,19 @@
# Copyright 2017 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Config file for Kokoro (in protobuf text format)
# Location of the continuous shell script in repository.
build_file: "grpc-node/kokoro.bat"
timeout_mins: 60