From d358627a19855218adab782c018d187b75dad48f Mon Sep 17 00:00:00 2001 From: Peter Squicciarini Date: Thu, 8 Aug 2019 15:41:39 -0700 Subject: [PATCH 1/4] Wait for Darwin build --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 43f39e2..52a160e 100755 --- a/build.sh +++ b/build.sh @@ -55,7 +55,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then npm install --global create-dmg - npm run gulp -- "vscode-darwin-min" + travis_wait npm run gulp -- "vscode-darwin-min" elif [[ "$CI_WINDOWS" == "True" ]]; then cp LICENSE.txt LICENSE.rtf # windows build expects rtf license npm run gulp -- "vscode-win32-${BUILDARCH}-min" From 91f1d58dd737f3dce2f0c43cc29c47f502f25916 Mon Sep 17 00:00:00 2001 From: Peter Squicciarini Date: Thu, 8 Aug 2019 17:28:04 -0700 Subject: [PATCH 2/4] Try another method to keep build process alive --- build.sh | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/build.sh b/build.sh index 52a160e..0f5cbfb 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,19 @@ #!/bin/bash + +function keep_alive() { + while true; do + date + sleep 60 + done +} + +function build() { + keep_alive & + KA_PID=$! + npm run gulp -- $1 + kill $KA_PID +} + if [[ "$SHOULD_BUILD" == "yes" ]]; then cp -rp src/* vscode/ cd vscode @@ -55,18 +70,18 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then npm install --global create-dmg - travis_wait npm run gulp -- "vscode-darwin-min" + build "vscode-darwin-min" elif [[ "$CI_WINDOWS" == "True" ]]; then cp LICENSE.txt LICENSE.rtf # windows build expects rtf license - npm run gulp -- "vscode-win32-${BUILDARCH}-min" - npm run gulp -- "vscode-win32-${BUILDARCH}-inno-updater" - npm run gulp -- "vscode-win32-${BUILDARCH}-system-setup" - npm run gulp -- "vscode-win32-${BUILDARCH}-user-setup" - npm run gulp -- "vscode-win32-${BUILDARCH}-archive" + build "vscode-win32-${BUILDARCH}-min" + build "vscode-win32-${BUILDARCH}-inno-updater" + build "vscode-win32-${BUILDARCH}-system-setup" + build "vscode-win32-${BUILDARCH}-user-setup" + build "vscode-win32-${BUILDARCH}-archive" else # linux - npm run gulp -- "vscode-linux-${BUILDARCH}-min" - npm run gulp -- "vscode-linux-${BUILDARCH}-build-deb" - npm run gulp -- "vscode-linux-${BUILDARCH}-build-rpm" + build "vscode-linux-${BUILDARCH}-min" + build "vscode-linux-${BUILDARCH}-build-deb" + build "vscode-linux-${BUILDARCH}-build-rpm" . ../create_appimage.sh fi From 5b1a4a1950a0e1a9ba4b6b12fd94393a02334ae3 Mon Sep 17 00:00:00 2001 From: Peter Squicciarini Date: Fri, 9 Aug 2019 08:49:47 -0700 Subject: [PATCH 3/4] Use new gulp targets --- build.sh | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/build.sh b/build.sh index 0f5cbfb..a6f7b77 100755 --- a/build.sh +++ b/build.sh @@ -1,19 +1,5 @@ #!/bin/bash -function keep_alive() { - while true; do - date - sleep 60 - done -} - -function build() { - keep_alive & - KA_PID=$! - npm run gulp -- $1 - kill $KA_PID -} - if [[ "$SHOULD_BUILD" == "yes" ]]; then cp -rp src/* vscode/ cd vscode @@ -23,6 +9,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then ../update_settings.sh yarn + yarn postinstall mv product.json product.json.bak # set fields in product.json @@ -68,20 +55,35 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template fi + 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 - build "vscode-darwin-min" + 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 - build "vscode-win32-${BUILDARCH}-min" - build "vscode-win32-${BUILDARCH}-inno-updater" - build "vscode-win32-${BUILDARCH}-system-setup" - build "vscode-win32-${BUILDARCH}-user-setup" - build "vscode-win32-${BUILDARCH}-archive" + 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" + yarn gulp "vscode-win32-${BUILDARCH}-system-setup" + yarn gulp "vscode-win32-${BUILDARCH}-user-setup" else # linux - build "vscode-linux-${BUILDARCH}-min" - build "vscode-linux-${BUILDARCH}-build-deb" - build "vscode-linux-${BUILDARCH}-build-rpm" + yarn gulp vscode-linux-x64-min-ci + yarn gulp vscode-reh-linux-x64-min-ci + yarn gulp vscode-reh-web-linux-x64-min-ci + + yarn gulp "vscode-linux-${BUILDARCH}-min" + yarn gulp "vscode-linux-${BUILDARCH}-build-deb" + yarn gulp "vscode-linux-${BUILDARCH}-build-rpm" . ../create_appimage.sh fi From e21f491ecdb3adc2fce829e9042f0980f75d3f0c Mon Sep 17 00:00:00 2001 From: Peter Squicciarini Date: Fri, 9 Aug 2019 09:42:15 -0700 Subject: [PATCH 4/4] Try keep alive for minify-vscode task --- build.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index a6f7b77..fd79999 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,12 @@ #!/bin/bash +function keep_alive() { + while true; do + date + sleep 60 + done +} + if [[ "$SHOULD_BUILD" == "yes" ]]; then cp -rp src/* vscode/ cd vscode @@ -57,7 +64,13 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then yarn gulp compile-build yarn gulp compile-extensions-build + + # this task is very slow on mac, so using a keep alive to keep travis alive + keep_alive & + KA_PID=$! yarn gulp minify-vscode + kill $KA_PID + yarn gulp minify-vscode-reh yarn gulp minify-vscode-reh-web @@ -81,7 +94,6 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then yarn gulp vscode-reh-linux-x64-min-ci yarn gulp vscode-reh-web-linux-x64-min-ci - yarn gulp "vscode-linux-${BUILDARCH}-min" yarn gulp "vscode-linux-${BUILDARCH}-build-deb" yarn gulp "vscode-linux-${BUILDARCH}-build-rpm" . ../create_appimage.sh