From 7074e0704d6b03865f028a8cab63657d80b403ae Mon Sep 17 00:00:00 2001
From: Lucas Kacher <lucaskacher@gmail.com>
Date: Sat, 26 May 2018 02:08:32 -0400
Subject: [PATCH] Update CI Install Scripts (#16)

* feat: move bazel 0.13.0 to 0.13.1
- we maintain point releases

* fix: fix bazel installs, use built-in-jdk
see: https://github.com/bazelbuild/continuous-integration/issues/269
---
 .travis.yml              |  2 +-
 scripts/install_bazel.sh | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4bec52f..a3301e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ env:
   - BAZEL_VERSION=0.10.1
   - BAZEL_VERSION=0.11.1
   - BAZEL_VERSION=0.12.0
-  - BAZEL_VERSION=0.13.0
+  - BAZEL_VERSION=0.13.1
 
 matrix:
   fast_finish: true
diff --git a/scripts/install_bazel.sh b/scripts/install_bazel.sh
index b1b2831..ecf6251 100755
--- a/scripts/install_bazel.sh
+++ b/scripts/install_bazel.sh
@@ -32,13 +32,14 @@ pushd $BAZEL_INSTALL
 
 if [ "$TRAVIS_OS_NAME" == "linux" ]; then
     echo "Installing Bazel ${BAZEL_VERSION} for Linux"
-    DEBIAN_PACKAGE_NAME="bazel_${BAZEL_VERSION}-linux-x86_64.deb"
-    wget --no-clobber "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${DEBIAN_PACKAGE_NAME}"
-    sudo dpkg -i ${DEBIAN_PACKAGE_NAME}
+    DEBIAN_INSTALL_SCRIPT="bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh"
+    wget --no-clobber "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${DEBIAN_INSTALL_SCRIPT}"
+    chmod +x ${DEBIAN_INSTALL_SCRIPT}
+    ./${DEBIAN_INSTALL_SCRIPT} --user
 elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
     echo "Installing Bazel ${BAZEL_VERSION} for Darwin"
-    DARWIN_INSTALL_SCRIPT=bazel-${BAZEL_VERSION}-without-jdk-installer-darwin-x86_64.sh
-    curl -sLO https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${DARWIN_INSTALL_SCRIPT}
+    DARWIN_INSTALL_SCRIPT=bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh
+    curl -sLO "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${DARWIN_INSTALL_SCRIPT}"
     chmod +x ${DARWIN_INSTALL_SCRIPT}
     ./${DARWIN_INSTALL_SCRIPT} --user
 else