Merge pull request #237 from stripedpajamas/wait

Update build process
Try keep alive for minify-vscode task
2026-04-12 00:37:19 +10:00 · 2019-08-09 10:37:08 -07:00 · 2019-08-09 09:42:15 -07:00 · 2019-08-09 08:49:47 -07:00 · 2019-08-08 17:28:04 -07:00 · 2019-08-08 15:41:39 -07:00
7 changed files with 55 additions and 79 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,6 @@ matrix:
    - os: linux
      sudo: required
      env: BUILDARCH=x64
-    - os: linux
-      sudo: required
-      env: BUILDARCH=ia32
-# arm64 builds don't work yet
-#    - os: linux
-#      sudo: required
-#      env: BUILDARCH=arm64
    - os: osx

 language: node_js
@@ -44,12 +37,9 @@ deploy:
    - ./*.zip
    - ./*.tar.gz
    - ./*.dmg
-    - vscode/.build/linux/deb/i386/deb/*.deb
-    - vscode/.build/linux/rpm/i386/*.rpm
-    - vscode/.build/linux/deb/amd64/deb/*.deb
-    - vscode/.build/linux/rpm/x86_64/*.rpm
-    - vscode/.build/linux/deb/arm64/deb/*.deb
-    - vscode/out/*.AppImage
+    - ./*.deb
+    - ./*.rpm
+    - ./*.AppImage
  on:
    all_branches: true
    condition: $SHOULD_BUILD = yes
--- a/build.sh
+++ b/build.sh
@@ -1,4 +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
@@ -8,6 +16,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
  ../update_settings.sh

  yarn
+  yarn postinstall
  mv product.json product.json.bak

  # set fields in product.json
@@ -53,20 +62,40 @@ 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
+
+  # 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
+
  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
    npm install --global create-dmg
-    npm run gulp -- "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
-    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"
+    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
-    npm run gulp -- "vscode-linux-${BUILDARCH}-min"
-    npm run gulp -- "vscode-linux-${BUILDARCH}-build-deb"
-    npm run gulp -- "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}-build-deb"
+    yarn gulp "vscode-linux-${BUILDARCH}-build-rpm"
    . ../create_appimage.sh
  fi

--- a/check_tags.sh
+++ b/check_tags.sh
@@ -15,25 +15,6 @@ if [ "$GITHUB_TOKEN" != "" ]; then
        echo "Building on Mac because we have no ZIP"
        export SHOULD_BUILD="yes"
      fi
-    elif [[ $BUILDARCH == "ia32" ]]; then
-      HAVE_IA32_RPM=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["i386.rpm"])')
-      HAVE_IA32_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["i386.deb"])')
-      HAVE_IA32_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "ia32-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
-      if [[ "$HAVE_IA32_RPM" != "true" ]]; then
-        echo "Building on Linux ia32 because we have no RPM"
-        export SHOULD_BUILD="yes"
-      fi
-      if [[ "$HAVE_IA32_DEB" != "true" ]]; then
-        echo "Building on Linux ia32 because we have no DEB"
-        export SHOULD_BUILD="yes"
-      fi
-      if [[ "$HAVE_IA32_TAR" != "true" ]]; then
-        echo "Building on Linux ia32 because we have no TAR"
-        export SHOULD_BUILD="yes"
-      fi
-      if [[ "$SHOULD_BUILD" != "yes" ]]; then
-        echo "Already have all the Linux ia32 builds"
-      fi
    elif [[ $BUILDARCH == "arm64" ]]; then
      # HAVE_ARM64_RPM=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["arm64.rpm"])')
      HAVE_ARM64_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["arm64.deb"])')
--- a/create_zip.sh
+++ b/create_zip.sh
@@ -4,9 +4,6 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
    cd VSCode-darwin
    zip -r -X -y ../VSCodium-darwin-${LATEST_MS_TAG}.zip ./*.app
-  elif [[ "$BUILDARCH" == "ia32" ]]; then
-    cd VSCode-linux-ia32
-    tar czf ../VSCodium-linux-ia32-${LATEST_MS_TAG}.tar.gz .
  elif [[ "$BUILDARCH" == "arm64" ]]; then
    cd VSCode-linux-arm64
    tar czf ../VSCodium-linux-arm64-${LATEST_MS_TAG}.tar.gz .
--- a/install_deps.sh
+++ b/install_deps.sh
@@ -6,22 +6,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 else
  sudo apt-get update
  sudo apt-get install -y fakeroot rpm jq
-  if [[ "$BUILDARCH" == "ia32" ]]; then
-    sudo dpkg --add-architecture i386
-    sudo apt-get update
-    sudo apt-get install -y gcc-multilib g++-multilib
-    sudo apt-get install -y \
-      libgirepository-1.0-1:i386 \
-      gir1.2-glib-2.0:i386 \
-      libglib2.0-dev:i386 \
-      gir1.2-secret-1:i386 \
-      libx11-dev:i386 \
-      libxkbfile-dev:i386 \
-      libsecret-1-dev:i386
-    export CFLAGS=-m32
-    export CXXFLAGS=-m32
-    export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
-  elif [[ $BUILDARCH == "arm64" ]]; then
+  if [[ $BUILDARCH == "arm64" ]]; then
    echo "deb http://ports.ubuntu.com/ubuntu-ports/ trusty main" | sudo tee -a /etc/apt/sources.list.d/arm64.list >/dev/null
    sudo dpkg --add-architecture arm64
    sudo apt-get update
--- a/sum.sh
+++ b/sum.sh
@@ -27,21 +27,13 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
    sum_file VSCodiumUserSetup-*.exe
    sum_file VSCodium-win32-*.zip
  else # linux
-    if [[ "$BUILDARCH" == "x64" ]]; then
-      deb_arch=amd64
-      rpm_arch=x86_64
+    cp vscode/out/*.AppImage .
+    cp vscode/.build/linux/deb/amd64/deb/*.deb .
+    cp vscode/.build/linux/rpm/x86_64/*.rpm .

-      # app image is x64 only
-      sum_file vscode/out/*.AppImage
-      cp vscode/out/*.{sha256,sha1} .
-    elif [[ "$BUILDARCH" == "ia32" ]]; then
-      deb_arch=i386
-      rpm_arch=i386
-    fi
+    sum_file *.AppImage
    sum_file VSCodium-linux*.tar.gz
-    sum_file vscode/.build/linux/deb/${deb_arch}/deb/*.deb
-    sum_file vscode/.build/linux/rpm/${rpm_arch}/*.rpm
-    cp vscode/.build/linux/deb/${deb_arch}/deb/*.{sha256,sha1} .
-    cp vscode/.build/linux/rpm/${rpm_arch}/*.{sha256,sha1} .
+    sum_file *.deb
+    sum_file *.rpm
  fi
 fi
--- a/update_version.sh
+++ b/update_version.sh
@@ -92,8 +92,8 @@ updateLatestVersion() {
 # thank you https://www.vinaygopinath.me/blog/tech/commit-to-master-branch-on-github-using-travis-ci/
 git clone https://github.com/${VERSIONS_REPO}.git
 cd versions
-git config user.email "travis@travis-ci.org"
-git config user.name "Travis CI"
+git config user.email "vscodium-ci@not-real.com"
+git config user.name "VSCodium CI"
 git remote rm origin
 git remote add origin https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/${VERSIONS_REPO}.git > /dev/null 2>&1
 cd ..
@@ -105,8 +105,11 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
  JSON="$(generateJson ${ASSET_NAME})"
  updateLatestVersion "$VERSION_PATH" "$JSON"
 elif [[ "$CI_WINDOWS" == "True" ]]; then
-  # windows update service supports user and archive types
-  # so we will run the commands twice
+  # system installer
+  ASSET_NAME=VSCodiumSetup-${BUILDARCH}-${LATEST_MS_TAG}.exe
+  VERSION_PATH="win32/${BUILDARCH}/system"
+  JSON="$(generateJson ${ASSET_NAME})"
+  updateLatestVersion "$VERSION_PATH" "$JSON"

  # user installer
  ASSET_NAME=VSCodiumUserSetup-${BUILDARCH}-${LATEST_MS_TAG}.exe
@@ -122,7 +125,6 @@ elif [[ "$CI_WINDOWS" == "True" ]]; then
 else # linux
  # update service links to tar.gz file
  # see https://update.code.visualstudio.com/api/update/linux-x64/stable/VERSION
-  # and https://update.code.visualstudio.com/api/update/linux-ia32/stable/VERSION
  # as examples
  ASSET_NAME=VSCodium-linux-${BUILDARCH}-${LATEST_MS_TAG}.tar.gz
  VERSION_PATH="linux/${BUILDARCH}"
Author	SHA1	Message	Date
Peter Squicciarini	9afbbd903b	Merge pull request #237 from stripedpajamas/wait Update build process	2019-08-09 10:37:08 -07:00
Peter Squicciarini	e21f491ecd	Try keep alive for minify-vscode task	2019-08-09 09:42:15 -07:00
Peter Squicciarini	5b1a4a1950	Use new gulp targets	2019-08-09 08:49:47 -07:00
Peter Squicciarini	91f1d58dd7	Try another method to keep build process alive	2019-08-08 17:28:04 -07:00
Peter Squicciarini	d358627a19	Wait for Darwin build	2019-08-08 15:41:39 -07:00
Peter Squicciarini	06cc20f63b	Merge pull request #233 from stripedpajamas/fix-hash-paths Fix hash paths	2019-07-26 00:38:34 -07:00
Peter Squicciarini	88503d7855	Fix hash paths	2019-07-25 09:07:08 -07:00
Peter Squicciarini	b44a4f56c4	Merge pull request #227 from stripedpajamas/win32-system-update Add update support for Win32 system install	2019-07-09 16:26:01 -07:00
Peter Squicciarini	72781d2f52	Add update support for Win32 system install	2019-07-09 15:25:17 -07:00
Peter Squicciarini	492c8c658e	Merge pull request #223 from stripedpajamas/no-linux-ia32 Remove Linux 32-bit code paths	2019-07-04 14:25:56 -07:00
Peter Squicciarini	59ef86968e	Remove Linux 32-bit code paths	2019-07-04 14:03:18 -07:00