From 94fb459c59ba9bdce319006d7e8700878183b292 Mon Sep 17 00:00:00 2001
From: mbilker <me@mbilker.us>
Date: Mon, 7 Dec 2015 21:14:13 -0500
Subject: [PATCH] fix(travis): readd whitespace, reorder according to build
 Travis build process

Found the order at https://docs.travis-ci.com/user/customizing-the-build/.

In nylas/N1@d95cb45147565f529c057fec25c5173f446dd1a0 the entire build script
was merged from Evan Morikawa, which reordered the whole Travis build script.
athis commit reorders the to have the Travis build environment config at the
beginning of the script and the build process at the end and the Travis
secure variables at the end of the script.
---
 .travis.yml | 80 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 45 insertions(+), 35 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6868d1dd9..c299962c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,26 @@
-compiler:
-- clang
-- gcc
+sudo: false
+
+git:
+  submodules: false
+
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - build-essential
+    - clang
+    - fakeroot
+    - g++-4.8
+    - git
+    - libgnome-keyring-dev
+    - xvfb
+
+branches:
+  only:
+  - master
+  - ci-test
+
 matrix:
   include:
   - os: linux
@@ -15,38 +35,9 @@ matrix:
     env: NODE_VERSION=0.10
   - os: osx
     env: NODE_VERSION=4.2 CC=clang CXX=clang++ PUBLISH_BUILD=true
-sudo: false
-install:
-- echo $CC
-- echo $CXX
-- clang --version
-- if [ "$CC" = "gcc-4.8" ]; then gcc-4.8 -v; else gcc -v; fi
-- git clone https://github.com/creationix/nvm.git /tmp/.nvm
-- source /tmp/.nvm/nvm.sh
-- nvm install $NODE_VERSION
-- nvm use --delete-prefix $NODE_VERSION
-before_script:
-- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb
-  start; fi
-script: script/cibuild
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - build-essential
-    - clang
-    - fakeroot
-    - g++-4.8
-    - git
-    - libgnome-keyring-dev
-    - xvfb
-branches:
-  only:
-    - master
-    - ci-test
-git:
-  submodules: false
+  - os: osx
+    env: NODE_VERSION=5 CC=clang CXX=clang++
+
 before_install:
 - openssl aes-256-cbc -k "$DECRYPTION_PASSWORD" -in build/resources/ssh/nylas-n1-ci-ssh.openssl.enc -out nylas-n1-ci-ssh -d
 - mv nylas-n1-ci-ssh ~/.ssh/id_rsa
@@ -57,6 +48,25 @@ before_install:
 - mkdir build/resources/certs
 - 2>/dev/null 1>/dev/null tar xvf build/resources/nylas/encrypted_certificates/travis/travis-files.tar --directory=build/resources/certs/
 - 2>/dev/null 1>/dev/null source build/resources/certs/set_unix_env.sh
+
+install:
+- echo $CC
+- echo $CXX
+- clang --version
+- if [ "$CC" = "gcc-4.8" ]; then gcc-4.8 -v; else gcc -v; fi
+- git clone https://github.com/creationix/nvm.git /tmp/.nvm
+- source /tmp/.nvm/nvm.sh
+- nvm install $NODE_VERSION
+- nvm use --delete-prefix $NODE_VERSION
+
+before_script:
+- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
+  export DISPLAY=:99.0;
+  sh -e /etc/init.d/xvfb start;
+  fi
+
+script: script/cibuild
+
 env:
   global:
     secure: O+XG3C/VnCfCVXTHudOQ6JMmBqrRHXh1j7jRwfQ3PYd27gm9BWNjvwlbWTLNcaar9gM00Pwi3rR8IujzJLlw3usZGWbJMLkz+aPYdOlbiDLhyMdIHwX4oI58d1eHx7m8Eun3qT3Y0VkO3blBNdWFWV4ebkfLZyygzXva4CDlSFtbeQYGy4ft76v7Au9uVlOUoV8f+juPx+0Jv+AtQmsY9Sf+6WbxrNaE9y2u2q1ks+XpjFn8Wt1f/xp/Vae0/MjJFpGIVfaUy+q7W8QQ0TyzSCM0eGtjxilS+BkGHjjvlLlMdCspRnZzpSJC+KkpEKLJrAPjR0DAfYMedWockEaIwGG8Onf90fXKG0nlvAg4WrWjnpr0q+V79zOU/yYD/kysLBYg6fYzv6uTvN7TzNaFkKaiQZvorI9P8w/wShGFHE4Y8JC5QU4CLI8q2qrkI38KKt3valIP4qxA/56aM0+D5roTecfh3Y40OcpqKZicpeNvuB1u2FmD2+oxLEb3MVnyfnVnDBP7Crp8/oLsIl/gGR/SVUEyLIimozugUySnCig1BEicygECvp6eRpEHryNrEvLKfxtppr3eWcRKQwnYwch4CaFwya0Lpc1dSA9NaOFQu0kR374s+fhqYgrkaCJevZd+ouKY+0Zt8gZ4CjJVhJ5YamwZAPG+obRd9G3xRM0=