Merge pull request #354 from piedar/split-scripts

refactor: extract prepare_vscode from build script

.travis.yml

@@ -4,10 +4,18 @@ matrix:
       sudo: required
       env: BUILDARCH=x64
       dist: trusty
+    - os: linux
+      sudo: required
+      env: BUILDARCH=arm64
+      dist: trusty
+    - os: linux
+      sudo: required
+      env: BUILDARCH=arm
+      dist: trusty
     - os: osx
 
 language: node_js
-node_js: "10"
+node_js: "12"
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
@@ -40,6 +48,7 @@ deploy:
     - ./*.deb
     - ./*.rpm
     - ./*.AppImage
+    - ./*.AppImage.zsync
   on:
     all_branches: true
     condition: $SHOULD_BUILD = yes

DOCS.md

@@ -65,9 +65,9 @@ To copy your settings manually:
 - Copy the contents of settings.json into the same place in VSCodium
 
 ## <a id="portable"></a>How do I run VSCodium in portable mode?
-You can follow the [Portable Mode instructions](https://code.visualstudio.com/docs/editor/portable) from the Visual Studio Code website. For Windows and Linux the instructions can be followed as written. For Mac OS, portable mode is enabled by the existence of a specially named folder. For Visual Studio Code that folder name is `code-portable-data`. For VSCodium, that folder name is `codium-portable-data`. 
-
-So to enable portable mode for VSCodium on Mac OS, follow the instructions outlined in the link above, but create a folder named `codium-portable-data` instead of `code-portable-data`.
+You can follow the [Portable Mode instructions](https://code.visualstudio.com/docs/editor/portable) from the Visual Studio Code website. 
+- **Windows** / **Linux** : the instructions can be followed as written.
+- **macOS** : portable mode is enabled by the existence of a specially named folder. For Visual Studio Code that folder name is `code-portable-data`. For VSCodium, that folder name is `codium-portable-data`. So to enable portable mode for VSCodium on Mac OS, follow the instructions outlined in the [link above](https://code.visualstudio.com/docs/editor/portable), but create a folder named `codium-portable-data` instead of `code-portable-data`.
 
 ## <a id="press-and-hold"></a>How do I press and hold a key and have it repeat in VSCodium (Mac)?
 

README.md

@@ -103,11 +103,11 @@ The builds are run every day, but exit early if there isn't a new release from M
 - [x] OS X (`zip`, `dmg`)
 - [x] Linux x64 (`deb`, `rpm`, `AppImage`, `tar.gz`)
 - [x] Linux x86 (`deb`, `rpm`, `tar.gz`) ([up to v1.35.1](https://code.visualstudio.com/updates/v1_36#_linux-32bit-support-ends))
+- [x] Linux arm64 (`deb`, `tar.gz`)
+- [x] Linux armhf (`deb`, `tar.gz`)
 - [x] Windows x64
 - [x] Windows x86
   
-The ARM architecture is not currently supported but is being worked on.
-
 ## <a id="donate"></a>Donate
 If you would like to support the development of VSCodium, feel free to send BTC to `3PgjE95yzBDTrSPxPiqoxSgZFuKPPAix1N`.
 

build.sh

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+function keep_alive_small() {
+  while true; do
+    echo .
+    read -t 60 < /proc/self/fd/1 > /dev/null 2>&1
+  done
+}
+
 function keep_alive() {
   while true; do
     date
@@ -12,71 +19,28 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   echo "LATEST_MS_COMMIT: ${LATEST_MS_COMMIT}"
   echo "BUILD_SOURCEVERSION: ${BUILD_SOURCEVERSION}"
 
-  cp -rp src/* vscode/
-  cd vscode
-
   export npm_config_arch="$BUILDARCH"
   export npm_config_target_arch="$BUILDARCH"
-  ../update_settings.sh
 
-  # apply patches
-  patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch
+  ./prepare_vscode.sh
 
-  yarn
-  yarn postinstall
-  mv product.json product.json.bak
-
-  # set fields in product.json
-  tipsAndTricksUrl='setpath(["tipsAndTricksUrl"]; "https://go.microsoft.com/fwlink/?linkid=852118")'
-  twitterUrl='setpath(["twitterUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533687")'
-  requestFeatureUrl='setpath(["requestFeatureUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533482")'
-  documentationUrl='setpath(["documentationUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533484#vscode")'
-  introductoryVideosUrl='setpath(["introductoryVideosUrl"]; "https://go.microsoft.com/fwlink/?linkid=832146")'
-  extensionAllowedBadgeProviders='setpath(["extensionAllowedBadgeProviders"]; ["api.bintray.com", "api.travis-ci.com", "api.travis-ci.org", "app.fossa.io", "badge.fury.io", "badge.waffle.io", "badgen.net", "badges.frapsoft.com", "badges.gitter.im", "badges.greenkeeper.io", "cdn.travis-ci.com", "cdn.travis-ci.org", "ci.appveyor.com", "circleci.com", "cla.opensource.microsoft.com", "codacy.com", "codeclimate.com", "codecov.io", "coveralls.io", "david-dm.org", "deepscan.io", "dev.azure.com", "flat.badgen.net", "gemnasium.com", "githost.io", "gitlab.com", "godoc.org", "goreportcard.com", "img.shields.io", "isitmaintained.com", "marketplace.visualstudio.com", "nodesecurity.io", "opencollective.com", "snyk.io", "travis-ci.com", "travis-ci.org", "visualstudio.com", "vsmarketplacebadge.apphb.com", "www.bithound.io", "www.versioneye.com"])'
-  updateUrl='setpath(["updateUrl"]; "https://vscodium.now.sh")'
-  releaseNotesUrl='setpath(["releaseNotesUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533483#vscode")'
-  keyboardShortcutsUrlMac='setpath(["keyboardShortcutsUrlMac"]; "https://go.microsoft.com/fwlink/?linkid=832143")'
-  keyboardShortcutsUrlLinux='setpath(["keyboardShortcutsUrlLinux"]; "https://go.microsoft.com/fwlink/?linkid=832144")'
-  keyboardShortcutsUrlWin='setpath(["keyboardShortcutsUrlWin"]; "https://go.microsoft.com/fwlink/?linkid=832145")'
-  quality='setpath(["quality"]; "stable")'
-  extensionsGallery='setpath(["extensionsGallery"]; {"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", "itemUrl": "https://marketplace.visualstudio.com/items"})'
-  nameShort='setpath(["nameShort"]; "VSCodium")'
-  nameLong='setpath(["nameLong"]; "VSCodium")'
-  linuxIconName='setpath(["linuxIconName"]; "vscodium")'
-  applicationName='setpath(["applicationName"]; "codium")'
-  win32MutexName='setpath(["win32MutexName"]; "vscodium")'
-  win32DirName='setpath(["win32DirName"]; "VSCodium")'
-  win32NameVersion='setpath(["win32NameVersion"]; "VSCodium")'
-  win32RegValueName='setpath(["win32RegValueName"]; "VSCodium")'
-  win32AppUserModelId='setpath(["win32AppUserModelId"]; "Microsoft.VSCodium")'
-  win32ShellNameShort='setpath(["win32ShellNameShort"]; "VSCodium")'
-  win32x64UserAppId='setpath (["win32x64UserAppId"]; "{{2E1F05D1-C245-4562-81EE-28188DB6FD17}")'
-  urlProtocol='setpath(["urlProtocol"]; "vscodium")'
-  extensionAllowedProposedApi='setpath(["extensionAllowedProposedApi"]; getpath(["extensionAllowedProposedApi"]) + ["ms-vsliveshare.vsliveshare"])'
-
-  product_json_changes="${tipsAndTricksUrl} | ${twitterUrl} | ${requestFeatureUrl} | ${documentationUrl} | ${introductoryVideosUrl} | ${extensionAllowedBadgeProviders} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${nameShort} | ${nameLong} | ${linuxIconName} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${extensionAllowedProposedApi}"
-  cat product.json.bak | jq "${product_json_changes}" > product.json
-  cat product.json
-  ../undo_telemetry.sh
+  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
-    # microsoft adds their apt repo to sources
-    # unless the app name is code-oss
-    # as we are renaming the application to vscodium
-    # we need to edit a line in the post install template
-    sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template
+    keep_alive_small &
+  else
+    keep_alive &
   fi
 
+  KA_PID=$!
+
   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
@@ -97,14 +61,18 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
     yarn gulp "vscode-win32-${BUILDARCH}-system-setup"
     yarn gulp "vscode-win32-${BUILDARCH}-user-setup"
   else # linux
-    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-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"
-    yarn gulp "vscode-linux-${BUILDARCH}-build-rpm"
+    if [[ "$BUILDARCH" == "x64" ]]; then
+      yarn gulp "vscode-linux-${BUILDARCH}-build-rpm"
+    fi
     . ../create_appimage.sh
   fi
 
+  kill $KA_PID
+
   cd ..
 fi

check_tags.sh

@@ -34,6 +34,20 @@ if [ "$GITHUB_TOKEN" != "" ]; then
       if [[ "$SHOULD_BUILD" != "yes" ]]; then
         echo "Already have all the Linux arm64 builds"
       fi
+    elif [[ $BUILDARCH == "arm" ]]; then
+      HAVE_ARM_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["armhf.deb"])')
+      HAVE_ARM_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "arm-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
+      if [[ "$HAVE_ARM_DEB" != "true" ]]; then
+        echo "Building on Linux arm because we have no DEB"
+        export SHOULD_BUILD="yes"
+      fi
+      if [[ "$HAVE_ARM_TAR" != "true" ]]; then
+        echo "Building on Linux arm because we have no TAR"
+        export SHOULD_BUILD="yes"
+      fi
+      if [[ "$SHOULD_BUILD" != "yes" ]]; then
+        echo "Already have all the Linux arm builds"
+      fi
     else
       HAVE_64_RPM=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["x86_64.rpm"])')
       HAVE_64_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["amd64.deb"])')

create_zip.sh

@@ -4,13 +4,10 @@ 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" == "arm64" ]]; then
-    cd VSCode-linux-arm64
-    tar czf ../VSCodium-linux-arm64-${LATEST_MS_TAG}.tar.gz .
   else
-    cd VSCode-linux-x64
-    tar czf ../VSCodium-linux-x64-${LATEST_MS_TAG}.tar.gz .
+    cd VSCode-linux-${BUILDARCH}
+    tar czf ../VSCodium-linux-${BUILDARCH}-${LATEST_MS_TAG}.tar.gz .
   fi
 
   cd ..
-fi
+fi

install_deps.sh

@@ -5,18 +5,37 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   brew install jq zip
 else
   sudo apt-get update
-  sudo apt-get install -y fakeroot rpm jq
-  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 install -y fakeroot jq
+  triplet=
+  case $BUILDARCH in
+  arm)
+    arch=armhf
+    triplet=arm-linux-gnueabihf
+    ;;
+
+  arm64)
+    arch=arm64
+    triplet=aarch64-linux-gnu
+    ;;
+  esac
+
+  if [[ -n "$triplet" ]]; then
+    sed 's/^deb /deb [arch=amd64] '/g -i /etc/apt/sources.list
+    echo "deb [arch=$arch] http://ports.ubuntu.com/ubuntu-ports/ trusty main" | sudo tee -a /etc/apt/sources.list.d/$arch.list >/dev/null
+    sudo dpkg --add-architecture $arch
     sudo apt-get update
-    sudo apt-get install libc6-dev-arm64-cross gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
-    sudo apt-get install libx11-dev:arm64 libxkbfile-dev:arm64
-    export CC=/usr/bin/aarch64-linux-gnu-gcc
-    export CXX=/usr/bin/aarch64-linux-gnu-g++
+    sudo apt-get install libc6-dev-$arch-cross gcc-$triplet g++-$triplet `apt-cache search x11proto | grep ^x11proto | cut -f 1 -d ' '` xz-utils pkg-config
+    mkdir -p dl
+    cd dl
+    apt-get download libx11-dev:$arch libx11-6:$arch libxkbfile-dev:$arch libxkbfile1:$arch libxau-dev:$arch libxdmcp-dev:$arch libxcb1-dev:$arch libsecret-1-dev:$arch libsecret-1-0:$arch libpthread-stubs0-dev:$arch libglib2.0-dev:$arch libglib2.0-0:$arch libffi-dev:$arch libffi6:$arch zlib1g:$arch libpcre3-dev:$arch libpcre3:$arch
+    for i in *.deb; do ar x $i; sudo tar -C / -xf data.tar.*; rm -f data.tar.*; done
+    cd ..
+    export CC=/usr/bin/$triplet-gcc
+    export CXX=/usr/bin/$triplet-g++
     export CC_host=/usr/bin/gcc
     export CXX_host=/usr/bin/g++
+    export PKG_CONFIG_LIBDIR=/usr/lib/$triplet/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
   else
-    sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev fakeroot rpm jq
+    sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev rpm
   fi
 fi

prepare_vscode.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+export npm_config_arch="$BUILDARCH"
+export npm_config_target_arch="$BUILDARCH"
+
+cp -rp src/* vscode/
+cd vscode || exit
+
+../update_settings.sh
+
+# apply patches
+patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch
+
+yarn --frozen-lockfile
+yarn postinstall
+mv product.json product.json.bak
+
+# set fields in product.json
+tipsAndTricksUrl='setpath(["tipsAndTricksUrl"]; "https://go.microsoft.com/fwlink/?linkid=852118")'
+twitterUrl='setpath(["twitterUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533687")'
+requestFeatureUrl='setpath(["requestFeatureUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533482")'
+documentationUrl='setpath(["documentationUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533484#vscode")'
+introductoryVideosUrl='setpath(["introductoryVideosUrl"]; "https://go.microsoft.com/fwlink/?linkid=832146")'
+extensionAllowedBadgeProviders='setpath(["extensionAllowedBadgeProviders"]; ["api.bintray.com", "api.travis-ci.com", "api.travis-ci.org", "app.fossa.io", "badge.fury.io", "badge.waffle.io", "badgen.net", "badges.frapsoft.com", "badges.gitter.im", "badges.greenkeeper.io", "cdn.travis-ci.com", "cdn.travis-ci.org", "ci.appveyor.com", "circleci.com", "cla.opensource.microsoft.com", "codacy.com", "codeclimate.com", "codecov.io", "coveralls.io", "david-dm.org", "deepscan.io", "dev.azure.com", "flat.badgen.net", "gemnasium.com", "githost.io", "gitlab.com", "godoc.org", "goreportcard.com", "img.shields.io", "isitmaintained.com", "marketplace.visualstudio.com", "nodesecurity.io", "opencollective.com", "snyk.io", "travis-ci.com", "travis-ci.org", "visualstudio.com", "vsmarketplacebadge.apphb.com", "www.bithound.io", "www.versioneye.com"])'
+updateUrl='setpath(["updateUrl"]; "https://vscodium.now.sh")'
+releaseNotesUrl='setpath(["releaseNotesUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533483#vscode")'
+keyboardShortcutsUrlMac='setpath(["keyboardShortcutsUrlMac"]; "https://go.microsoft.com/fwlink/?linkid=832143")'
+keyboardShortcutsUrlLinux='setpath(["keyboardShortcutsUrlLinux"]; "https://go.microsoft.com/fwlink/?linkid=832144")'
+keyboardShortcutsUrlWin='setpath(["keyboardShortcutsUrlWin"]; "https://go.microsoft.com/fwlink/?linkid=832145")'
+quality='setpath(["quality"]; "stable")'
+extensionsGallery='setpath(["extensionsGallery"]; {"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", "itemUrl": "https://marketplace.visualstudio.com/items"})'
+nameShort='setpath(["nameShort"]; "VSCodium")'
+nameLong='setpath(["nameLong"]; "VSCodium")'
+linuxIconName='setpath(["linuxIconName"]; "vscodium")'
+applicationName='setpath(["applicationName"]; "codium")'
+win32MutexName='setpath(["win32MutexName"]; "vscodium")'
+win32DirName='setpath(["win32DirName"]; "VSCodium")'
+win32NameVersion='setpath(["win32NameVersion"]; "VSCodium")'
+win32RegValueName='setpath(["win32RegValueName"]; "VSCodium")'
+win32AppUserModelId='setpath(["win32AppUserModelId"]; "Microsoft.VSCodium")'
+win32ShellNameShort='setpath(["win32ShellNameShort"]; "VSCodium")'
+win32x64UserAppId='setpath (["win32x64UserAppId"]; "{{2E1F05D1-C245-4562-81EE-28188DB6FD17}")'
+urlProtocol='setpath(["urlProtocol"]; "vscodium")'
+extensionAllowedProposedApi='setpath(["extensionAllowedProposedApi"]; getpath(["extensionAllowedProposedApi"]) + ["ms-vsliveshare.vsliveshare"])'
+
+product_json_changes="${tipsAndTricksUrl} | ${twitterUrl} | ${requestFeatureUrl} | ${documentationUrl} | ${introductoryVideosUrl} | ${extensionAllowedBadgeProviders} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${nameShort} | ${nameLong} | ${linuxIconName} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${extensionAllowedProposedApi}"
+cat product.json.bak | jq "${product_json_changes}" > product.json
+cat product.json
+
+../undo_telemetry.sh
+
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+  # microsoft adds their apt repo to sources
+  # unless the app name is code-oss
+  # as we are renaming the application to vscodium
+  # we need to edit a line in the post install template
+  sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template
+fi

src/resources/linux/appimage/pkg2appimage

@@ -467,5 +467,6 @@ fi
 # Go out of AppImage
 cd ..
 
+export UPDATE_INFORMATION="gh-releases-zsync|VSCodium|vscodium|latest|*.AppImage.zsync"
 generate_type2_appimage
-ls -lh ../out/*.AppImage
+ls -lh ../out/*.AppImage*

sum.sh

@@ -28,8 +28,8 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
     sum_file VSCodium-win32-*.zip
   else # linux
     cp out/*.AppImage .
-    cp vscode/.build/linux/deb/amd64/deb/*.deb .
-    cp vscode/.build/linux/rpm/x86_64/*.rpm .
+    cp vscode/.build/linux/deb/*/deb/*.deb .
+    cp vscode/.build/linux/rpm/*/*.rpm .
 
     sum_file *.AppImage
     sum_file VSCodium-linux*.tar.gz

win32-build.yml

@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0 
   inputs:
-    versionSpec: '10.x'
+    versionSpec: "12.13.0"
 - script: |
     choco install jq 
   displayName: 'install jq from choco'