From 82ca6538b11b63ada3a697629cc5fe8c152885e6 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Fri, 21 Sep 2018 23:50:28 -0700
Subject: [PATCH] travis: clean up & tweaks

---
 .travis.yml | 47 +++++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 27f50544eb..9357d7bddf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 language: c++
-os:
-  - linux
-  - osx
+matrix:
+  include:
+  - os: linux
+  - os: osx
 env:
   global:
   - CARGO_PATH=$HOME/.cargo/
@@ -19,32 +20,46 @@ cache:
   - "$RUSTUP_PATH"
   - third_party/v8/build/linux/debian_sid_amd64-sysroot/
   - third_party/v8/third_party/llvm-build/
-install: |
+install:
+- |-
   # Install Rust.
-  # TODO(ry) Include rustc in third_party https://github.com/denoland/deno/issues/386
-  rustc --version
-  if [ $? != 0 ]; then
+  # TODO(ry) Include rustc in third_party.
+  # https://github.com/denoland/deno/issues/386
+  if [ ! $(which rustc) ]; then
     curl -sSf https://sh.rustup.rs | sh -s -- -y
   fi
+  rustc --version
+  cargo --version
+- |-
+  # Install ccache (OS X only).
+  # TODO: Save ccache in the Travis CI cache.
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    brew install ccache && export PATH="/usr/local/opt/ccache/libexec:$PATH";
+    brew install ccache &&
+    export PATH="/usr/local/opt/ccache/libexec:$PATH"
   fi
 before_script:
 - ccache -s
-- "./tools/setup.py"
+- ./tools/setup.py
 script:
-- "./tools/lint.py"
+- ./tools/lint.py
 - bash -c "sleep 2100; pkill ninja" &
-- "./tools/build.py -j2"
-- "./tools/test.py $DENO_BUILD_PATH"
-before_deploy: |
-  # gzip and name release to denote platform
-  gzip -c $DENO_BUILD_PATH/deno > $DENO_BUILD_PATH/deno_${TRAVIS_OS_NAME}_x64.gz
+- ./tools/build.py -j2
+- ./tools/test.py $DENO_BUILD_PATH
+after_success:
+- |
+  # Run benchmarks and publish the result to github pages.
+  if [ $BENCHMARK ]; then
+    ./tools/benchmark.py $DENO_BUILD_PATH &&
+    cp -r website/* gh-pages/
+  fi
+before_deploy:
+- gzip -c $DENO_BUILD_PATH/deno > $DENO_BUILD_PATH/deno_${TRAVIS_OS_NAME}_x64.gz
 deploy:
-  provider: releases
+- provider: releases
   api_key:
     secure: RIwv515oDcPAlEvt7uG8FeSFi6Tz6ODJUOXcFj6FYUPszxJ7Cg1kBLKln+fNW5OeOc52VsaZb/vPZ85skyEM6zk2ijL9FcSnnfNEm548w77iH6G0sk09NgBTy6KRXES6NZHD9jN1YTWYkT2G1NQi7mLqxR8a8pnWTbeK5HhtSWGsZPtXqf5iQbvnWsmKA0/w+FIgKupU0xe/qsYjh0eMLYpZDUWoKO0VxBKJ/ix5Uz91aJTjMIcHHij+ALg4pk+FkDotdyx39XB9b25KDxGuaI7NxWjSPzDxs/ZBHP6QYDLO0ti93ftvLAxRoBKPFoZrXqAu3KG9anr9WvxE40DO9OdV0VX2ZUatMUQm3DpSheN8ml2sErFqjIInqlpkdOVDYORz7FikPxkb9DKt+iuyFfxPRa4YWJv2tg8+Hy/nRCQw69OoKqrSNJ8KJDB3OjYbRBtdHz79RLJhTsGZla6RiyXfM7crR7CbFjbwdbW3Pt60t24fhvXQ0SwR0QTgzS/ieYEQHq/9GtSQA/Tn4kdIkyN6BdOMrQd/aUtgKmNdqbSlfmWGNyNZIxHdB+3RrTNT1tagkRI4UHEUfEujpIdYKwLjv0Xmi/VtTM+zOSkzHsIWGPfHBmIGnXfAItUHqivQYJ15E+dzg3T1CEbBxkDQtvwien9Fa8/pBsMkyovl8ps=
   file: "$DENO_BUILD_PATH/deno_${TRAVIS_OS_NAME}_x64.gz"
   on:
     tags: true
     repo: denoland/deno
+  skip-cleanup: true