From fa4f18b59e7266c1aacbf883d5516f3a76c0d315 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Sun, 29 Mar 2020 20:22:55 -0400
Subject: [PATCH] more travis cleanup

---
 .travis.yml                        | 4 ----
 src/travis/linux-before-install.sh | 7 +++----
 src/travis/linux-install.sh        | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 399ada35..0610315c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,22 +61,18 @@ jobs:
       filter_secrets: false
     - os: linux
       name: "Python 3.6 Source Testing"
-      dist: bionic
       language: python
       python: 3.6
     - os: linux
       name: "Python 3.7 Source Testing"
-      dist: bionic
       language: python
       python: 3.7
     - os: linux
       name: "Python nightly Source Testing"
-      dist: bionic
       language: python
       python: nightly
     - os: linux
       name: "Python PyPi Source Testing"
-      dist: xenial
       language: python
       python: pypy3
     - os: osx
diff --git a/src/travis/linux-before-install.sh b/src/travis/linux-before-install.sh
index d0667385..77b3c15b 100755
--- a/src/travis/linux-before-install.sh
+++ b/src/travis/linux-before-install.sh
@@ -5,8 +5,7 @@ if [[ "$TRAVIS_JOB_NAME" == *"Testing" ]]; then
   echo "running tests with this version"
 else
   export whereibelong=$(pwd)
-  export dist=$(lsb_release --codename --short)
-  echo "We are running on Ubuntu $dist $PLATFORM"
+  echo "We are running on Ubuntu $TRAVIS_DSIT $PLATFORM"
   export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib
   cpucount=$(nproc --all)
   echo "This device has $cpucount CPUs for compiling..."
@@ -42,7 +41,7 @@ else
     echo "Installing deps for python3"
     sudo cp -v /etc/apt/sources.list /tmp
     sudo chmod a+rwx /tmp/sources.list
-    echo "deb-src http://archive.ubuntu.com/ubuntu/ $dist main" >> /tmp/sources.list
+    echo "deb-src http://archive.ubuntu.com/ubuntu/ $TRAVIS_DIST main" >> /tmp/sources.list
     sudo cp -v /tmp/sources.list /etc/apt
     sudo apt-get -qq --yes update > /dev/null
     sudo apt-get -qq --yes build-dep python3 > /dev/null
@@ -91,7 +90,7 @@ else
   python=~/python/bin/python3
   pip=~/python/bin/pip3
 
-  if ([ "${dist}" == "trusty" ] || [ "${dist}" == "xenial" ]); then
+  if ([ "${TRAVIS_DIST}" == "trusty" ] || [ "${TRAVIS_DIST}" == "xenial" ]) && [ "${PLATFORM}" == "x86_64" ]; then
     echo "Installing deps for StaticX..."
     if [ ! -d patchelf-$PATCHELF_VERSION ]; then
       echo "Downloading PatchELF $PATCHELF_VERSION"
diff --git a/src/travis/linux-install.sh b/src/travis/linux-install.sh
index 0cfd8c1c..a1dd1385 100755
--- a/src/travis/linux-install.sh
+++ b/src/travis/linux-install.sh
@@ -18,7 +18,7 @@ else
   du -h gam/gam
   time $gam version extended
 
-  if ([ "${dist}" == "trusty" ] || [ "${dist}" == "xenial" ]); then
+  if ([ "${TRAVIS_DIST}" == "trusty" ] || [ "${TRAVIS_DIST}" == "xenial" ]) && [ "${PLATFORM}" == "x86_64" ]; then
     GAM_LEGACY_ARCHIVE=gam-${GAMVERSION}-${GAMOS}-${PLATFORM}-legacy.tar.xz
     $python -OO -m staticx gam/gam gam/gam-staticx
     strip gam/gam-staticx