travis: streamline config

- Reorder the testing matrix to more or less the order of importance.
- Don't install libc and libstdc++ explicitly; it's not necessary and
  for some reason it installs a bunch of other packages.
- We only test on Linux, so get rid of the conditional.
- Don't error out if apt update fails, since that seems to happen every
  now and then because some repository changed keys.

Signed-off-by: Omar Sandoval <osandov@fb.com>

diff --git a/.travis.yml b/.travis.yml
index acc1598fb7e300bbd2ab9ce43e23897b6035bc73..81c83e744a9de71f1b9caeffd6df553f710fa1fe 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,13 +6,13 @@ os:
 sudo: required
 
 compiler:
-  - clang
   - gcc
+  - clang
 
 env:
   matrix:
-    - BUILD_ARCH="x86"
     - BUILD_ARCH="x86_64"
+    - BUILD_ARCH="x86"
 
 addons:
   apt:
@@ -22,12 +22,10 @@ addons:
       - make
 
 before_install:
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      sudo apt update;
-      sudo apt install -y libc6-dev libc6-dev:i386 'libstdc++-*-dev' 'libstdc++-*-dev:i386' gcc-multilib g++-multilib;
-      curl -L "https://storage.googleapis.com/shellcheck/shellcheck-stable.linux.x86_64.tar.xz" | tar -xJ;
-      sudo cp shellcheck-stable/shellcheck /usr/local/bin/;
-    fi
+  - sudo apt update || true
+  - sudo apt install -y gcc-multilib g++-multilib
+  - curl -L "https://storage.googleapis.com/shellcheck/shellcheck-stable.linux.x86_64.tar.xz" | tar -xJ
+  - sudo cp shellcheck-stable/shellcheck /usr/local/bin/
   - CFLAGS="-Werror"
   - CXXFLAGS="-Werror"
   - if [ "$BUILD_ARCH" == "x86" ]; then