From 59ef86968e39abba8db25d60f847329ef374467e Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Thu, 4 Jul 2019 14:03:18 -0700
Subject: [PATCH] Remove Linux 32-bit code paths

---
 .travis.yml       |  3 ---
 check_tags.sh     | 19 -------------------
 create_zip.sh     |  3 ---
 install_deps.sh   | 17 +----------------
 sum.sh            | 22 +++++++---------------
 update_version.sh |  1 -
 6 files changed, 8 insertions(+), 57 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8344398a248..d250242acfb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +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
diff --git a/check_tags.sh b/check_tags.sh
index 680cd65382f..25288356dc9 100755
--- 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"])')
diff --git a/create_zip.sh b/create_zip.sh
index 97780ee9fad..a5ae004c14d 100755
--- 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 .
diff --git a/install_deps.sh b/install_deps.sh
index 135cccd17af..e01f06f2555 100755
--- 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
diff --git a/sum.sh b/sum.sh
index a73afef69e4..8786b350b66 100755
--- 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
-
-      # 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 vscode/out/*.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 vscode/.build/linux/deb/amd64/deb/*.deb
+    sum_file vscode/.build/linux/rpm/x86_64/*.rpm
+
+    cp vscode/out/*.{sha256,sha1} .
+    cp vscode/.build/linux/deb/amd64/deb/*.{sha256,sha1} .
+    cp vscode/.build/linux/rpm/x86_64/*.{sha256,sha1} .
   fi
 fi
diff --git a/update_version.sh b/update_version.sh
index f069c74b9df..87cd0b7f867 100755
--- a/update_version.sh
+++ b/update_version.sh
@@ -122,7 +122,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}"