(experiment) remove -reh- tasks; set yarn concurrency

This commit is contained in:
Peter Squicciarini 2020-09-14 09:57:19 -07:00
parent 07ac47b131
commit b012b6c1d0
No known key found for this signature in database
GPG key ID: 08B897BCAB6763CB
2 changed files with 9 additions and 13 deletions

View file

@ -1,5 +1,7 @@
#!/bin/bash
set -e
function keep_alive_small() {
while true; do
echo .
@ -26,8 +28,6 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
cd vscode || exit
export NODE_ENV=production
# these tasks are very slow, so using a keep alive to keep travis alive
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
keep_alive_small &
@ -37,24 +37,20 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
KA_PID=$!
yarn gulp hygiene
yarn monaco-compile-check
yarn valid-layers-check
yarn gulp compile-build
yarn gulp compile-extensions-build
yarn gulp minify-vscode
yarn gulp minify-vscode-reh
yarn gulp minify-vscode-reh-web
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
npm install --global create-dmg
yarn gulp vscode-darwin-min-ci
yarn gulp vscode-reh-darwin-min-ci
yarn gulp vscode-reh-web-darwin-min-ci
elif [[ "$CI_WINDOWS" == "True" ]]; then
cp LICENSE.txt LICENSE.rtf # windows build expects rtf license
yarn gulp "vscode-win32-${BUILDARCH}-min-ci"
yarn gulp "vscode-reh-win32-${BUILDARCH}-min-ci"
yarn gulp "vscode-reh-web-win32-${BUILDARCH}-min-ci"
yarn gulp "vscode-win32-${BUILDARCH}-code-helper"
yarn gulp "vscode-win32-${BUILDARCH}-inno-updater"
yarn gulp "vscode-win32-${BUILDARCH}-archive"
@ -62,8 +58,6 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
yarn gulp "vscode-win32-${BUILDARCH}-user-setup"
else # linux
yarn gulp vscode-linux-${BUILDARCH}-min-ci
yarn gulp vscode-reh-linux-${BUILDARCH}-min-ci
yarn gulp vscode-reh-web-linux-${BUILDARCH}-min-ci
yarn gulp "vscode-linux-${BUILDARCH}-build-deb"
if [[ "$BUILDARCH" == "x64" ]]; then

View file

@ -1,5 +1,7 @@
#!/bin/bash
set -e
export npm_config_arch="$BUILDARCH"
export npm_config_target_arch="$BUILDARCH"
@ -11,7 +13,7 @@ cd vscode || exit
# apply patches
patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch
yarn --frozen-lockfile
CHILD_CONCURRENCY=1 yarn --frozen-lockfile
yarn postinstall
if [[ "$BUILDARCH" == *"arm"* ]]; then