Merge pull request #531 from stripedpajamas/fix-arm

Fix armhf and x64

.github/workflows/linux.yml

@@ -0,0 +1,92 @@
+name: linux_build
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  push:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    container: 
+      image: ${{ matrix.image }}
+      env:
+        OS_NAME: 'linux'
+        VSCODE_ARCH: ${{ matrix.vscode_arch }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        vscode_arch: [x64, arm64, armhf]
+        include:
+        - vscode_arch: x64
+          npm_arch: x64
+          image: vscodium/vscodium-linux-build-agent:x64
+        - vscode_arch: arm64
+          npm_arch: arm64
+          image: vscodium/vscodium-linux-build-agent:buster-arm64
+        - vscode_arch: armhf
+          npm_arch: armv7l
+          image: vscodium/vscodium-linux-build-agent:buster-armhf
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v1.4.3
+        with:
+          node-version: 12.14.1
+
+      - name: Install Yarn
+        run: npm install -g yarn
+
+      - name: Clone VSCode repo
+        run: ./get_repo.sh
+
+      - name: Check existing VSCodium tags/releases
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./check_tags.sh
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          npm_config_arch: ${{ matrix.npm_arch }}
+        run: ./build.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Zip release
+        run: |
+          cd VSCode-linux-${VSCODE_ARCH}
+          tar czf ../VSCodium-linux-${VSCODE_ARCH}-${LATEST_MS_TAG}.tar.gz .
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Generate shasums
+        run: ./sum.sh
+        if: env.SHOULD_BUILD == 'yes'
+      
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: env.SHOULD_BUILD == 'yes'
+        with:
+          tag_name: ${{ env.LATEST_MS_TAG }}
+          files: |
+            ./*.sha256
+            ./*.zip
+            ./*.tar.gz
+            ./*.deb
+            ./*.rpm
+            ./*.AppImage
+            ./*.AppImage.zsync
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Update versions repo
+        if: env.SHOULD_BUILD == 'yes'
+        run: ./update_version.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
+          GITHUB_USERNAME: ${{ github.repository_owner }}
+

.github/workflows/macos.yml

@@ -0,0 +1,98 @@
+name: macos_build
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  push:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: macOS-latest
+    env:
+      OS_NAME: "osx"
+    steps:
+      - uses: actions/checkout@v2
+        
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v1.4.3
+        with:
+          node-version: 12.14.1
+          
+      - name: Clone VSCode repo
+        run: |
+          . get_repo.sh
+          echo "::set-env name=LATEST_MS_TAG::$LATEST_MS_TAG"
+          echo "::set-env name=LATEST_MS_COMMIT::$LATEST_MS_COMMIT"
+
+      - name: Check existing VSCodium tags/releases
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          . check_tags.sh
+          echo "::set-env name=SHOULD_BUILD::$SHOULD_BUILD"
+          
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./build.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Sign binary
+        env:
+          CERTIFICATE_OSX_P12: ${{ secrets.CERTIFICATE_OSX_P12 }}
+          CERTIFICATE_OSX_PASSWORD: ${{ secrets.CERTIFICATE_OSX_PASSWORD }}
+          CERTIFICATE_OSX_ID: ${{ secrets.CERTIFICATE_OSX_ID }}
+        if: env.SHOULD_BUILD == 'yes'
+        run: |
+          if [ -d "VSCode-darwin" ]; then # just in case the build failed
+            cd VSCode-darwin
+            export CERTIFICATE_P12=VSCodium.p12
+            echo $CERTIFICATE_OSX_P12 | base64 --decode > $CERTIFICATE_P12
+            export KEYCHAIN=build.keychain
+            security create-keychain -p mysecretpassword $KEYCHAIN
+            security default-keychain -s $KEYCHAIN
+            security unlock-keychain -p mysecretpassword $KEYCHAIN
+            security import $CERTIFICATE_P12 -k $KEYCHAIN -P $CERTIFICATE_OSX_PASSWORD -T /usr/bin/codesign
+            security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN
+            codesign --deep --force --verbose --sign "$CERTIFICATE_OSX_ID" VSCodium.app
+          fi
+
+      - name: Zip release
+        run: |
+          cd VSCode-darwin
+          zip -r -X -y ../VSCodium-darwin-${LATEST_MS_TAG}.zip ./*.app
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: DMG the release
+        run: |
+          pushd VSCode-darwin
+          npx create-dmg VSCodium.app ..
+          mv "../VSCodium ${LATEST_MS_TAG}.dmg" "../VSCodium.${LATEST_MS_TAG}.dmg"
+          popd
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Generate shasums
+        run: ./sum.sh
+        if: env.SHOULD_BUILD == 'yes'
+      
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: env.SHOULD_BUILD == 'yes'
+        with:
+          tag_name: ${{ env.LATEST_MS_TAG }}
+          files: |
+            ./*.zip
+            ./*.dmg
+            ./*.sha256
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Update versions repo
+        if: env.SHOULD_BUILD == 'yes'
+        run: ./update_version.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
+          GITHUB_USERNAME: ${{ github.repository_owner }}
+

.travis.yml

@@ -1,57 +0,0 @@
-matrix:
-  include:
-    - os: linux
-      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: "12"
-
-before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - export PATH="$HOME/.yarn/bin:$PATH"
-  - . install_deps.sh
-  - . get_repo.sh
-  - . check_tags.sh
-
-script:
-  - ./build.sh
-
-before_deploy:
-  - ./sign_mac_app.sh
-  - ./create_zip.sh
-  - ./create_dmg.sh
-  - ./sum.sh
-
-deploy:
-  provider: releases
-  skip_cleanup: true
-  overwrite: true
-  name: $LATEST_MS_TAG
-  api_key: $GITHUB_TOKEN
-  file_glob: true
-  file:
-    - ./*.sha256
-    - ./*.zip
-    - ./*.tar.gz
-    - ./*.dmg
-    - ./*.deb
-    - ./*.rpm
-    - ./*.AppImage
-    - ./*.AppImage.zsync
-  on:
-    all_branches: true
-    condition: $SHOULD_BUILD = yes
-
-after_deploy:
-  - ./update_version.sh

README.md

@@ -9,7 +9,6 @@
 
   [![current release](https://img.shields.io/github/release/vscodium/vscodium.svg)](https://github.com/vscodium/vscodium/releases)
 [![windows_build_status](https://dev.azure.com/vscodium/VSCodium/_apis/build/status/VSCodium.vscodium?branchName=master)](https://dev.azure.com/vscodium/VSCodium/_build?definitionId=1)
-[![build status](https://travis-ci.com/VSCodium/vscodium.svg?branch=master)](https://travis-ci.com/VSCodium/vscodium) 
 [![license](https://img.shields.io/github/license/VSCodium/vscodium.svg)](https://github.com/VSCodium/vscodium/blob/master/LICENSE)
 [![Gitter](https://img.shields.io/gitter/room/vscodium/vscodium.svg)](https://gitter.im/VSCodium/Lobby)
 [![codium](https://snapcraft.io//codium/badge.svg)](https://snapcraft.io/codium)
@@ -76,7 +75,7 @@ snap install codium
 You can always install using the downloads (deb, rpm, tar) on the [releases page](https://github.com/VSCodium/vscodium/releases), but you can also install using your favorite package manager and get automatic updates. [@paulcarroty](https://github.com/paulcarroty) has set up a repository with instructions [here](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo). Any issues installing VSCodium using your package manager should be directed to that repository's issue tracker. 
 
 #### <a id="install-on-arch-linux"></a>Install on Arch Linux
-VSCodium is available in [AUR](https://wiki.archlinux.org/index.php/Arch_User_Repository) as package [vscodium-bin](https://aur.archlinux.org/packages/vscodium-bin/), maintained by [@plague-doctor](https://github.com/plague-doctor).
+VSCodium is available in [AUR](https://wiki.archlinux.org/index.php/Arch_User_Repository) as package [vscodium-bin](https://aur.archlinux.org/packages/vscodium-bin/), maintained by [@CRKatri](https://github.com/CRKatri).
 
 #### <a id="flatpak"></a>Flatpak Option (Linux)
 VSCodium is (unofficially) available as a Flatpak app [here](https://flathub.org/apps/details/com.vscodium.codium) and the build repo is [here](https://github.com/flathub/com.vscodium.codium). If your distribution has support for [flatpak](https://flathub.org), and you have enabled the [flathub repo](https://flatpak.org/setup/):
@@ -119,9 +118,9 @@ According to the VS Code Marketplace [Terms of Use](https://aka.ms/vsmarketplace
 Please note that some Visual Studio Code extensions have licenses that restrict their use to the official Visual Studio Code builds and therefore do not work with VSCodium. See [this note](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#proprietary-debugging-tools) on the Docs page for what's been found so far and possible workarounds.
 
 ### How are the VSCodium binaries built?
-If you would like to see the commands we run to build `vscode` into VSCodium binaries, have a look at the [`.travis.yml` file](https://github.com/VSCodium/vscodium/blob/master/.travis.yml) (for Linux and OS X builds) and the [`win32-build.yml` file](https://github.com/VSCodium/vscodium/blob/master/win32-build.yml) (for Windows builds). These build files call all the other scripts in the repo. If you find something that doesn't make sense, feel free to ask about it [on Gitter](https://gitter.im/VSCodium/Lobby).
+If you would like to see the commands we run to build `vscode` into VSCodium binaries, have a look at the workflow files in `.github/workflow` (for Linux and OS X builds) and the `win32-build.yml` file (for Windows builds). These build files call all the other scripts in the repo. If you find something that doesn't make sense, feel free to ask about it [on Gitter](https://gitter.im/VSCodium/Lobby).
 
-The builds are run every day, but exit early if there isn't a new release from Microsoft. To examine the build logs, go [here for Linux / OS X](https://travis-ci.com/VSCodium/vscodium) and [here for Windows](https://dev.azure.com/vscodium/VSCodium/_build?definitionId=1)
+The builds are run every day, but exit early if there isn't a new release from Microsoft. 
 
 ## <a id="supported-os"></a>Supported OS
 - [x] OS X (`zip`, `dmg`)

build.sh

@@ -1,78 +1,46 @@
 #!/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
-    sleep 60
-  done
-}
+set -ex
 
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
+  npm config set scripts-prepend-node-path true
+
   export BUILD_SOURCEVERSION=$LATEST_MS_COMMIT
   echo "LATEST_MS_COMMIT: ${LATEST_MS_COMMIT}"
   echo "BUILD_SOURCEVERSION: ${BUILD_SOURCEVERSION}"
 
-  export npm_config_arch="$BUILDARCH"
-  export npm_config_target_arch="$BUILDARCH"
+  if [[ "$CI_WINDOWS" == "True" ]]; then
+    export npm_config_arch="$BUILDARCH"
+    export npm_config_target_arch="$BUILDARCH"
+  fi
 
-  ./prepare_vscode.sh
+  . prepare_vscode.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
-    keep_alive_small &
-  else
-    keep_alive &
-  fi
-
-  KA_PID=$!
+  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
+  if [[ "$OS_NAME" == "osx" ]]; then
     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"
     yarn gulp "vscode-win32-${BUILDARCH}-system-setup"
     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
-      yarn gulp "vscode-linux-${BUILDARCH}-build-rpm"
-    fi
+    yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
+    yarn gulp "vscode-linux-${VSCODE_ARCH}-build-deb"
+    yarn gulp "vscode-linux-${VSCODE_ARCH}-build-rpm"
     . ../create_appimage.sh
   fi
 
-  kill $KA_PID
-
   cd ..
 fi

check_tags.sh

@@ -1,28 +1,23 @@
 #!/bin/bash
 
-REPOSITORY=${TRAVIS_REPO_SLUG:-"VSCodium/vscodium"}
+set -e
+
+REPOSITORY=${GITHUB_REPOSITORY:-"VSCodium/vscodium"}
 GITHUB_RESPONSE=$(curl -s -H "Authorization: token $GITHUB_TOKEN" https://api.github.com/repos/$REPOSITORY/releases/tags/$LATEST_MS_TAG)
-echo "Github response: ${GITHUB_RESPONSE}"
 VSCODIUM_ASSETS=$(echo $GITHUB_RESPONSE | jq '.assets')
-echo "VSCodium assets: ${VSCODIUM_ASSETS}"
 
 # if we just don't have the github token, get out fast
 if [ "$GITHUB_TOKEN" != "" ]; then
   if [ "$VSCODIUM_ASSETS" != "null" ]; then
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+    if [[ "$OS_NAME" == "osx" ]]; then
       HAVE_MAC=$(echo $VSCODIUM_ASSETS | jq --arg suffix "darwin-$LATEST_MS_TAG.zip" 'map(.name) | contains([$suffix])')
       if [[ "$HAVE_MAC" != "true" ]]; then
         echo "Building on Mac because we have no ZIP"
         export SHOULD_BUILD="yes"
       fi
-    elif [[ $BUILDARCH == "arm64" ]]; then
-      # HAVE_ARM64_RPM=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["arm64.rpm"])')
+    elif [[ $VSCODE_ARCH == "arm64" ]]; then
       HAVE_ARM64_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["arm64.deb"])')
       HAVE_ARM64_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "arm64-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
-      # if [[ "$HAVE_ARM64_RPM" != "true" ]]; then
-      #   echo "Building on Linux arm64 because we have no RPM"
-      #   export SHOULD_BUILD="yes"
-      # fi
       if [[ "$HAVE_ARM64_DEB" != "true" ]]; then
         echo "Building on Linux arm64 because we have no DEB"
         export SHOULD_BUILD="yes"
@@ -34,9 +29,9 @@ if [ "$GITHUB_TOKEN" != "" ]; then
       if [[ "$SHOULD_BUILD" != "yes" ]]; then
         echo "Already have all the Linux arm64 builds"
       fi
-    elif [[ $BUILDARCH == "arm" ]]; then
+    elif [[ $VSCODE_ARCH == "armhf" ]]; 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])')
+      HAVE_ARM_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "armhf-$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"
@@ -72,13 +67,6 @@ if [ "$GITHUB_TOKEN" != "" ]; then
     echo "Release assets do not exist at all, continuing build"
     export SHOULD_BUILD="yes"
   fi
-  if git rev-parse $LATEST_MS_TAG >/dev/null 2>&1
-  then
-    export TRAVIS_TAG=$LATEST_MS_TAG
-  else
-    git config --local user.name "Travis CI"
-    git config --local user.email "builds@travis-ci.com"
-    git tag $LATEST_MS_TAG
-  fi
 fi
 
+echo "SHOULD_BUILD=$SHOULD_BUILD" >> $GITHUB_ENV

create_appimage.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
-if [[ "$BUILDARCH" == "x64" ]]; then
-  # install a dep needed for this process
-  sudo apt-get install desktop-file-utils
-
-  cd ..
-  
-  bash -e src/resources/linux/appimage/pkg2appimage VSCodium-AppImage-Recipe.yml
-fi
+# if [[ "$VSCODE_ARCH" == "x64" ]]; then
+#   # install a dep needed for this process
+#   sudo apt-get install desktop-file-utils
+# 
+#   cd ..
+#   
+#   bash -e src/resources/linux/appimage/pkg2appimage VSCodium-AppImage-Recipe.yml
+# fi

create_dmg.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-if [[ "$SHOULD_BUILD" == "yes" ]]; then
-  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    cd VSCode-darwin
-    create-dmg VSCodium.app ..
-    mv "../VSCodium ${LATEST_MS_TAG}.dmg" "../VSCodium.${LATEST_MS_TAG}.dmg"
-  fi
-  cd ..
-fi

create_zip.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-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
-  else
-    cd VSCode-linux-${BUILDARCH}
-    tar czf ../VSCodium-linux-${BUILDARCH}-${LATEST_MS_TAG}.tar.gz .
-  fi
-
-  cd ..
-fi

get_repo.sh

@@ -1,15 +1,16 @@
 #!/bin/bash
 
-if [ -d vscode ]; then
-  cd vscode 
-  git fetch --all
-else
-  git clone https://github.com/Microsoft/vscode.git
-  cd vscode
+# figure out latest tag by calling MS update API
+UPDATE_INFO=$(curl https://update.code.visualstudio.com/api/update/darwin/stable/lol)
+export LATEST_MS_COMMIT=$(echo $UPDATE_INFO | jq -r '.version')
+export LATEST_MS_TAG=$(echo $UPDATE_INFO | jq -r '.name')
+echo "Got the latest MS tag: ${LATEST_MS_TAG}"
+
+git clone https://github.com/Microsoft/vscode.git --branch $LATEST_MS_TAG --depth 1
+
+# for GH actions
+if [[ "$CI_WINDOWS" != "True" ]]; then
+  echo "LATEST_MS_COMMIT=$LATEST_MS_COMMIT" >> $GITHUB_ENV
+  echo "LATEST_MS_TAG=$LATEST_MS_TAG" >> $GITHUB_ENV
 fi
 
-export LATEST_MS_COMMIT=$(git rev-list --tags --max-count=1)
-export LATEST_MS_TAG=$(git describe --tags ${LATEST_MS_COMMIT})
-echo "Got the latest MS tag: ${LATEST_MS_TAG}"
-git checkout $LATEST_MS_TAG
-cd ..

install_deps.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-  brew update
-  brew install jq zip
-else
-  sudo apt-get update
-  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-$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 rpm
-  fi
-fi

prepare_vscode.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 
-export npm_config_arch="$BUILDARCH"
-export npm_config_target_arch="$BUILDARCH"
+set -e
+
+if [[ "$CI_WINDOWS" == "True" ]]; then
+  export npm_config_arch="$BUILDARCH"
+  export npm_config_target_arch="$BUILDARCH"
+fi
 
 cp -rp src/* vscode/
 cd vscode || exit
@@ -11,19 +15,18 @@ 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
-yarn postinstall
-
-if [[ "$BUILDARCH" == *"arm"* ]]; then
-  sed -i -z 's/,\n[^\n]*arm[^\n]*//' node_modules/vscode-sqlite3/binding.gyp
-  sed -i "s/Release\/sqlite'/Release\/sqlite.node'/" node_modules/vscode-sqlite3/lib/sqlite3.js
-  yarn add -D electron-rebuild
-  npx electron-rebuild -f -w vscode-sqlite3
+if [[ "$OS_NAME" == "osx" ]]; then
+  CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional
+  npm_config_argv='{"original":["--ignore-optional"]}' yarn postinstall
+else
+  CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+  yarn postinstall
 fi
 
 mv product.json product.json.bak
 
 # set fields in product.json
+checksumFailMoreInfoUrl='setpath(["checksumFailMoreInfoUrl"]; "https://go.microsoft.com/fwlink/?LinkId=828886")'
 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")'
@@ -53,16 +56,18 @@ urlProtocol='setpath(["urlProtocol"]; "vscodium")'
 extensionAllowedProposedApi='setpath(["extensionAllowedProposedApi"]; getpath(["extensionAllowedProposedApi"]) + ["ms-vsliveshare.vsliveshare", "ms-vscode-remote.remote-ssh"])'
 serverDataFolderName='setpath(["serverDataFolderName"]; ".vscode-server-oss")'
 
-product_json_changes="${tipsAndTricksUrl} | ${twitterUrl} | ${requestFeatureUrl} | ${documentationUrl} | ${introductoryVideosUrl} | ${extensionAllowedBadgeProviders} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${linkProtectionTrustedDomains} | ${nameShort} | ${nameLong} | ${linuxIconName} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${extensionAllowedProposedApi} | ${serverDataFolderName}"
+product_json_changes="${checksumFailMoreInfoUrl} | ${tipsAndTricksUrl} | ${twitterUrl} | ${requestFeatureUrl} | ${documentationUrl} | ${introductoryVideosUrl} | ${extensionAllowedBadgeProviders} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${linkProtectionTrustedDomains} | ${nameShort} | ${nameLong} | ${linuxIconName} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${extensionAllowedProposedApi} | ${serverDataFolderName}"
 cat product.json.bak | jq "${product_json_changes}" > product.json
 cat product.json
 
 ../undo_telemetry.sh
 
-if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+if [[ "$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
+
+cd ..

sign_mac_app.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# thanks to https://www.jviotti.com/2016/03/16/how-to-code-sign-os-x-electron-apps-in-travis-ci.html
-# for the helpful instructions
-if [[ "$SHOULD_BUILD" == "yes" ]]; then
-  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    if [ -d "VSCode-darwin" ]; then # just in case the build failed
-      cd VSCode-darwin
-      export CERTIFICATE_P12=VSCodium.p12
-      echo $CERTIFICATE_OSX_P12 | base64 --decode > $CERTIFICATE_P12
-      export KEYCHAIN=build.keychain
-      security create-keychain -p mysecretpassword $KEYCHAIN
-      security default-keychain -s $KEYCHAIN
-      security unlock-keychain -p mysecretpassword $KEYCHAIN
-      security import $CERTIFICATE_P12 -k $KEYCHAIN -P $CERTIFICATE_OSX_PASSWORD -T /usr/bin/codesign
-      
-      # https://docs.travis-ci.com/user/common-build-problems/
-      security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN
-      
-      codesign --deep --force --verbose --sign "$CERTIFICATE_OSX_ID" VSCodium.app
-    fi
-  fi
-fi

src/vs/base/test/node/encoding/fixtures/some.json.png

@@ -1,11 +0,0 @@
-{
-	"type": "typescript",
-
-	"sources": [
-		"examples/company.ts",
-		"examples/conway.ts",
-		"examples/employee.ts",
-		"examples/large.ts",
-		"examples/small.ts"
-	]
-}

src/vs/base/test/node/encoding/fixtures/some.xml.png

@@ -1,3 +0,0 @@
-<?xml>
-
-</xml>

src/vs/workbench/browser/parts/titlebar/media/code-icon.svg

@@ -1,19 +0,0 @@
-<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M508.827 0.772461C224.654 0.772461 0.40625 305.969 0.40625 710.148L229.547 749.213C169.075 696.515 206.161 288.058 508.827 288.058C811.493 288.058 858.584 696.417 797.134 749.213L1023.37 710.148C1023.37 305.969 793.001 0.772461 508.827 0.772461Z" fill="#81DA56"/>
-<path d="M1023.39 707.988C1023.39 845.616 861.716 835.104 753.987 874.753C646.259 914.402 544.677 1023.77 511.891 1023.77C476.573 1023.77 323.282 888.651 272.129 874.753C177.65 841.24 0.390625 845.616 0.390625 707.988C0.390625 426.078 229.397 822.803 511.891 822.803C794.384 822.803 1023.39 426.078 1023.39 707.988Z" fill="#81DA56"/>
-<path d="M116.646 836.315C199.184 857.711 259.346 867.78 281.722 879.107C442.204 945.968 477.586 1021.56 509.669 1021.56C550.626 1021.56 578.994 843.184 578.994 843.184C465.003 803.607 384.094 670.917 194.953 615.54C194.953 615.54 56.6348 567.484 27.1417 598.443C-5.58102 675.828 -34.9724 794.619 116.646 836.315Z" fill="url(#paint0_linear)"/>
-<path d="M732.759 881.38C573.081 963.17 560.416 1015.19 507.22 1022.74C507.22 1022.74 488.789 1020.59 402.516 951.423C362.868 919.636 291.022 883.112 291.022 883.112C497.05 914.559 584.058 679.569 824.424 615.573C824.424 615.573 892.438 799.59 732.759 881.38Z" fill="#81DA56"/>
-<defs>
-<linearGradient id="paint0_linear" x1="297.596" y1="598.39" x2="420.618" y2="879.08" gradientUnits="userSpaceOnUse">
-<stop stop-color="#81DA56"/>
-<stop offset="0.233393" stop-color="#77D34A"/>
-<stop offset="0.433117" stop-color="#6BCD3C"/>
-<stop offset="0.580887" stop-color="#65C139"/>
-<stop offset="0.699298" stop-color="#60B338"/>
-<stop offset="0.838132" stop-color="#529F2D"/>
-<stop offset="0.928389" stop-color="#4B9726"/>
-<stop offset="1" stop-color="#3C7E1B"/>
-<stop offset="1" stop-color="#438E1F"/>
-</linearGradient>
-</defs>
-</svg>

src/vs/workbench/contrib/update/browser/media/code-icon.svg

@@ -1,19 +0,0 @@
-<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M508.827 0.772461C224.654 0.772461 0.40625 305.969 0.40625 710.148L229.547 749.213C169.075 696.515 206.161 288.058 508.827 288.058C811.493 288.058 858.584 696.417 797.134 749.213L1023.37 710.148C1023.37 305.969 793.001 0.772461 508.827 0.772461Z" fill="#81DA56"/>
-<path d="M1023.39 707.988C1023.39 845.616 861.716 835.104 753.987 874.753C646.259 914.402 544.677 1023.77 511.891 1023.77C476.573 1023.77 323.282 888.651 272.129 874.753C177.65 841.24 0.390625 845.616 0.390625 707.988C0.390625 426.078 229.397 822.803 511.891 822.803C794.384 822.803 1023.39 426.078 1023.39 707.988Z" fill="#81DA56"/>
-<path d="M116.646 836.315C199.184 857.711 259.346 867.78 281.722 879.107C442.204 945.968 477.586 1021.56 509.669 1021.56C550.626 1021.56 578.994 843.184 578.994 843.184C465.003 803.607 384.094 670.917 194.953 615.54C194.953 615.54 56.6348 567.484 27.1417 598.443C-5.58102 675.828 -34.9724 794.619 116.646 836.315Z" fill="url(#paint0_linear)"/>
-<path d="M732.759 881.38C573.081 963.17 560.416 1015.19 507.22 1022.74C507.22 1022.74 488.789 1020.59 402.516 951.423C362.868 919.636 291.022 883.112 291.022 883.112C497.05 914.559 584.058 679.569 824.424 615.573C824.424 615.573 892.438 799.59 732.759 881.38Z" fill="#81DA56"/>
-<defs>
-<linearGradient id="paint0_linear" x1="297.596" y1="598.39" x2="420.618" y2="879.08" gradientUnits="userSpaceOnUse">
-<stop stop-color="#81DA56"/>
-<stop offset="0.233393" stop-color="#77D34A"/>
-<stop offset="0.433117" stop-color="#6BCD3C"/>
-<stop offset="0.580887" stop-color="#65C139"/>
-<stop offset="0.699298" stop-color="#60B338"/>
-<stop offset="0.838132" stop-color="#529F2D"/>
-<stop offset="0.928389" stop-color="#4B9726"/>
-<stop offset="1" stop-color="#3C7E1B"/>
-<stop offset="1" stop-color="#438E1F"/>
-</linearGradient>
-</defs>
-</svg>

src/vs/workbench/contrib/welcome/code-icon.svg

@@ -1,19 +0,0 @@
-<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M508.827 0.772461C224.654 0.772461 0.40625 305.969 0.40625 710.148L229.547 749.213C169.075 696.515 206.161 288.058 508.827 288.058C811.493 288.058 858.584 696.417 797.134 749.213L1023.37 710.148C1023.37 305.969 793.001 0.772461 508.827 0.772461Z" fill="#81DA56"/>
-<path d="M1023.39 707.988C1023.39 845.616 861.716 835.104 753.987 874.753C646.259 914.402 544.677 1023.77 511.891 1023.77C476.573 1023.77 323.282 888.651 272.129 874.753C177.65 841.24 0.390625 845.616 0.390625 707.988C0.390625 426.078 229.397 822.803 511.891 822.803C794.384 822.803 1023.39 426.078 1023.39 707.988Z" fill="#81DA56"/>
-<path d="M116.646 836.315C199.184 857.711 259.346 867.78 281.722 879.107C442.204 945.968 477.586 1021.56 509.669 1021.56C550.626 1021.56 578.994 843.184 578.994 843.184C465.003 803.607 384.094 670.917 194.953 615.54C194.953 615.54 56.6348 567.484 27.1417 598.443C-5.58102 675.828 -34.9724 794.619 116.646 836.315Z" fill="url(#paint0_linear)"/>
-<path d="M732.759 881.38C573.081 963.17 560.416 1015.19 507.22 1022.74C507.22 1022.74 488.789 1020.59 402.516 951.423C362.868 919.636 291.022 883.112 291.022 883.112C497.05 914.559 584.058 679.569 824.424 615.573C824.424 615.573 892.438 799.59 732.759 881.38Z" fill="#81DA56"/>
-<defs>
-<linearGradient id="paint0_linear" x1="297.596" y1="598.39" x2="420.618" y2="879.08" gradientUnits="userSpaceOnUse">
-<stop stop-color="#81DA56"/>
-<stop offset="0.233393" stop-color="#77D34A"/>
-<stop offset="0.433117" stop-color="#6BCD3C"/>
-<stop offset="0.580887" stop-color="#65C139"/>
-<stop offset="0.699298" stop-color="#60B338"/>
-<stop offset="0.838132" stop-color="#529F2D"/>
-<stop offset="0.928389" stop-color="#4B9726"/>
-<stop offset="1" stop-color="#3C7E1B"/>
-<stop offset="1" stop-color="#438E1F"/>
-</linearGradient>
-</defs>
-</svg>

sum.sh

@@ -19,7 +19,7 @@ sum_file () {
 }
 
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
-  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+  if [[ "$OS_NAME" == "osx" ]]; then
     sum_file VSCodium-darwin-*.zip
     sum_file VSCodium*.dmg
   elif [[ "$CI_WINDOWS" == "True" ]]; then

undo_telemetry.sh

@@ -3,7 +3,7 @@
 TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)"
 REPLACEMENT="s/$TELEMETRY_URLS/0\.0\.0\.0/g"
 
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+if [[ "$OS_NAME" == "osx" ]]; then
   grep -rl --exclude-dir=.git -E $TELEMETRY_URLS . | xargs sed -i '' -E $REPLACEMENT
 else
   grep -rl --exclude-dir=.git -E $TELEMETRY_URLS . | xargs sed -i -E $REPLACEMENT

update_settings.sh

@@ -5,7 +5,7 @@ TELEMETRY_CRASH_REPORTER="'telemetry.enableCrashReporter':"
 
 replace () {
   echo $1
-  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+  if [[ "$OS_NAME" == "osx" ]]; then
     sed -i '' -E "$1" $2
   else
     sed -i -E "$1" $2

update_version.sh

@@ -33,8 +33,7 @@ if [[ "$CI_WINDOWS" == "True" ]]; then
 
   git config --global core.autocrlf true
 else
-  # TRAVIS_REPO_SLUG = e.g. VSCodium/vscodium
-  VERSIONS_REPO=$(echo ${TRAVIS_REPO_SLUG} | awk -F"/" '{ print $1 }')/versions
+  VERSIONS_REPO="${GITHUB_USERNAME}/versions"
 fi
 
 # generateJson <assetName>
@@ -98,7 +97,7 @@ git remote rm origin
 git remote add origin https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/${VERSIONS_REPO}.git > /dev/null 2>&1
 cd ..
 
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+if [[ "$OS_NAME" == "osx" ]]; then
   # zip, sha1, and sha256 files are all at top level dir
   ASSET_NAME=VSCodium-darwin-${LATEST_MS_TAG}.zip
   VERSION_PATH="darwin"
@@ -126,8 +125,8 @@ else # linux
   # update service links to tar.gz file
   # see https://update.code.visualstudio.com/api/update/linux-x64/stable/VERSION
   # as examples
-  ASSET_NAME=VSCodium-linux-${BUILDARCH}-${LATEST_MS_TAG}.tar.gz
-  VERSION_PATH="linux/${BUILDARCH}"
+  ASSET_NAME=VSCodium-linux-${VSCODE_ARCH}-${LATEST_MS_TAG}.tar.gz
+  VERSION_PATH="linux/${VSCODE_ARCH}"
   JSON="$(generateJson ${ASSET_NAME})"
   updateLatestVersion "$VERSION_PATH" "$JSON"
 fi
@@ -137,7 +136,7 @@ cd versions
 git pull origin master # in case another build just pushed
 git add .
 dateAndMonth=`date "+%D %T"`
-git commit -m "Travis update: $dateAndMonth (Build $TRAVIS_BUILD_NUMBER)"
+git commit -m "CI update: $dateAndMonth (Build $GITHUB_RUN_NUMBER)"
 if ! git push origin master --quiet; then
   git pull origin master
   git push origin master --quiet

win32-build.yml

@@ -1,12 +1,7 @@
 steps:
 - task: NodeTool@0 
   inputs:
-    versionSpec: "12.13.0"
-- script: |
-    choco install jq 
-  displayName: 'install jq from choco'
-- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-  displayName: 'Install Yarn'
+    versionSpec: "12.14.1"
 - task: UsePythonVersion@0
   displayName: 'Use Python 2.x'
   inputs:
@@ -27,9 +22,6 @@ steps:
     filePath: 'check_tags.ps1'
   env:
     MAPPED_GITHUB_TOKEN: $(GITHUB_TOKEN)
-- script: |
-    git -C vscode status
-  displayName: 'vscode status'
 - powershell: |
     bash ./build.sh
   displayName: 'go build it!'