From 07637e5b5b7e5f6906106233b9227bf19df724b2 Mon Sep 17 00:00:00 2001
From: mehrdadn <mehrdadn@users.noreply.github.com>
Date: Fri, 12 Jun 2020 12:59:22 -0700
Subject: [PATCH] Upgrade Bazel and add required patches (#8847)

---
 bazel/ray_deps_setup.bzl                            | 1 +
 ci/travis/install-bazel.sh                          | 2 +-
 thirdparty/patches/prometheus-windows-headers.patch | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 thirdparty/patches/prometheus-windows-headers.patch

diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl
index b77233072..b153abc0e 100644
--- a/bazel/ray_deps_setup.bzl
+++ b/bazel/ray_deps_setup.bzl
@@ -199,6 +199,7 @@ def ray_deps_setup():
         url = "https://github.com/jupp0r/prometheus-cpp/archive/60eaa4ea47b16751a8e8740b05fe70914c68a480.tar.gz",
         sha256 = "ec825b802487ac18b0d98e2e8b7961487b12562f8f82e424521d0a891d9e1373",
         patches = [
+            "//thirdparty/patches:prometheus-windows-headers.patch",
             # https://github.com/jupp0r/prometheus-cpp/pull/225
             "//thirdparty/patches:prometheus-windows-zlib.patch",
             "//thirdparty/patches:prometheus-windows-pollfd.patch",
diff --git a/ci/travis/install-bazel.sh b/ci/travis/install-bazel.sh
index 71a50f690..e23eaf06a 100755
--- a/ci/travis/install-bazel.sh
+++ b/ci/travis/install-bazel.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
 
-version="1.1.0"
+version="3.2.0"
 achitecture="${HOSTTYPE}"
 platform="unknown"
 case "${OSTYPE}" in
diff --git a/thirdparty/patches/prometheus-windows-headers.patch b/thirdparty/patches/prometheus-windows-headers.patch
new file mode 100644
index 000000000..cd610a182
--- /dev/null
+++ b/thirdparty/patches/prometheus-windows-headers.patch
@@ -0,0 +1,7 @@
+diff --git core/src/histogram.cc core/src/histogram.cc
+--- core/src/histogram.cc
++++ core/src/histogram.cc
+@@ -6,1 +6,2 @@
+ #include <numeric>
++#include <stdexcept>
+--