Adding JOBS environment variable to speed builds up, and reducing scope of Alpine Linux builds.

This commit is contained in:
Nicolas "Pixel" Noble 2018-03-13 22:22:31 +01:00
parent 8857ccae34
commit fcf472e7cb
6 changed files with 13 additions and 13 deletions

View File

@ -21,6 +21,7 @@ cd $tool_dir/../../..
base_dir=$(pwd)
export ARTIFACTS_OUT=$base_dir/artifacts
export JOBS=8
rm -rf build || true
@ -32,4 +33,4 @@ $tool_dir/build_artifact_node.sh
$tool_dir/build_artifact_node_arm.sh
docker run -e ARTIFACTS_OUT=/var/grpc/artifacts -v $base_dir:/var/grpc alpine_node_artifact bash -c /var/grpc/tools/run_tests/artifacts/build_artifact_node.sh --with-alpine
docker run -e JOBS=8 -e ARTIFACTS_OUT=/var/grpc/artifacts -v $base_dir:/var/grpc alpine_node_artifact /var/grpc/tools/run_tests/artifacts/build_artifact_node.sh --with-alpine

View File

@ -20,6 +20,8 @@ set electron_versions=1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0
set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm
set JOBS=8
del /f /q BUILD || rmdir build /s /q
call npm update || goto :error

View File

@ -16,12 +16,15 @@
set -ex
NODE_ALPINE_BUILD=false
arch_list=( ia32 x64 )
node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 )
electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 )
while true ; do
case $1 in
--with-alpine)
NODE_ALPINE_BUILD=true
arch_list=( x64 )
electron_versions=( )
;;
"")
;;
@ -33,8 +36,6 @@ while true ; do
shift || break
done
NODE_ALPINE_BUILD=$1
umask 022
cd $(dirname $0)/../../..
@ -45,17 +46,11 @@ mkdir -p "${ARTIFACTS_OUT}"
npm update
arch_list=( ia32 x64 )
node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 )
electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 )
for arch in ${arch_list[@]}
do
for version in ${node_versions[@]}
do
./node_modules/.bin/node-pre-gyp configure rebuild package --target=$version --target_arch=$arch --grpc_alpine=$NODE_ALPINE_BUILD
./node_modules/.bin/node-pre-gyp configure rebuild package --target=$version --target_arch=$arch
cp -r build/stage/* "${ARTIFACTS_OUT}"/
done

View File

@ -20,6 +20,7 @@ PowerShell -Command .\install-nvm-windows.ps1
SET NVM_HOME=%ROOT%nvm
SET NVM_SYMLINK=%ROOT%nvm\nodejs
SET PATH=%NVM_HOME%;%NVM_SYMLINK%;%PATH%
SET JOBS=8
nvm version

View File

@ -38,6 +38,7 @@ set -ex
npm install --unsafe-perm
mkdir -p reports
export JOBS=8
# TODO(mlumish): Add electron tests

View File

@ -34,6 +34,6 @@ Linux)
mv packages/grpc-native-core/artifacts .
;;
Darwin)
ARTIFACTS_OUT=$base_dir/artifacts ./packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh
JOBS=8 ARTIFACTS_OUT=$base_dir/artifacts ./packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh
;;
esac