From 6a5fb33306b6b7724f3a45934aa91b67b1196823 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Sun, 13 Oct 2019 14:06:29 -0400
Subject: [PATCH] further linux cleanup, re-enable e2e

---
 .travis.yml                               |  3 ++-
 src/travis/linux-x86_64-before-install.sh | 31 ++++++++++++-----------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 11663147..cfa66d55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,6 +58,7 @@ matrix:
       name: "Linux ARM64 Bionic"
       language: bash
       filter_secrets: false
+      allow_failures: true
       env:
         - GAMOS=linux
         - PLATFORM=arm64
@@ -175,7 +176,7 @@ script:
 - if [ "$VMTYPE" == "build" ]; then $gam version extended | grep TLSv1\.[23]; fi # Builds should default TLS 1.2 or 1.3 to Google
 - if [ "$VMTYPE" == "build" ]; then GAM_TLS_MIN_VERSION=TLSv1_2 $gam version extended location tls-v1-0.badssl.com:1010; [[ $? == 3 ]]; fi # expect fail since server doesn't support our TLS version
 - export jid="$(cut -d'.' -f2 <<<"$TRAVIS_JOB_NUMBER")"
-#- if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then export e2e=true; fi
+- if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then export e2e=true; fi
 - if [ "$e2e" = true ]; then export gam_user=gam-travis-$jid@pdl.jaylee.us; fi
 - if [ "$e2e" = true ]; then openssl aes-256-cbc -K $encrypted_ab10ec38326e_key -iv $encrypted_ab10ec38326e_iv -in travis/oauth2service.json.enc -out $gampath/oauth2service.json -d; fi
 - if [ "$e2e" = true ]; then cat travis/cfg_template.json | python travis/svars-write.py &> /dev/null; fi
diff --git a/src/travis/linux-x86_64-before-install.sh b/src/travis/linux-x86_64-before-install.sh
index 6ba7908b..600ec2e4 100755
--- a/src/travis/linux-x86_64-before-install.sh
+++ b/src/travis/linux-x86_64-before-install.sh
@@ -71,26 +71,27 @@ else
     make install > /dev/null
     cd ~
   fi
+
+  if [[ "$dist" == "precise" ]]; then
+    echo "Installing deps for StaticX..."
+    sudo apt-get install --yes scons
+    if [ ! -d patchelf-$PATCHELF_VERSION ]; then
+      echo "Downloading PatchELF $PATCHELF_VERSION"
+      wget https://nixos.org/releases/patchelf/patchelf-$PATCHELF_VERSION/patchelf-$PATCHELF_VERSION.tar.bz2
+      tar xf patchelf-$PATCHELF_VERSION.tar.bz2
+      cd patchelf-$PATCHELF_VERSION
+      ./configure
+      make
+      sudo make install
+    fi
+    $pip install git+https://github.com/JonathonReinhart/staticx.git@master
+  fi
+
   python=~/python/bin/python3
   pip=~/python/bin/pip3
   cd $whereibelong
 fi
 
-if [[ "$dist" == "precise" ]]; then
-  echo "Installing deps for StaticX..."
-  sudo apt-get install --yes scons
-  if [ ! -d patchelf-$PATCHELF_VERSION ]; then
-    echo "Downloading PatchELF $PATCHELF_VERSION"
-    wget https://nixos.org/releases/patchelf/patchelf-$PATCHELF_VERSION/patchelf-$PATCHELF_VERSION.tar.bz2
-    tar xf patchelf-$PATCHELF_VERSION.tar.bz2
-    cd patchelf-$PATCHELF_VERSION
-    ./configure
-    make
-    sudo make install
-  fi
-  $pip install git+https://github.com/JonathonReinhart/staticx.git@master
-fi
-
 echo "Upgrading pip packages..."
 $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 $pip install -U
 $pip install --upgrade -r src/requirements.txt