Upgrade Bazel and add required patches (ray-project#8847)

LecJackS · Jun 12, 2020 · 07637e5 · 07637e5
1 parent 4b31b38
commit 07637e5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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>
+--