Various CI fixes and cleanup

.bazelrc

@@ -2,7 +2,7 @@
 build --enable_platform_specific_config
 ###############################################################################
 # On       Windows, provide: USE_CLANG_CL=1, CC=clang, BAZEL_LLVM, BAZEL_SH
-# On all platforms, provide: PYTHON2_BIN_PATH, PYTHON3_BIN_PATH
+# On all platforms, provide: PYTHON3_BIN_PATH=python
 ###############################################################################
 build --action_env=PATH
 build:linux   --compilation_mode=opt

bazel/ray_deps_setup.bzl

@@ -215,8 +215,8 @@ def ray_deps_setup():
         url = "https://github.com/grpc/grpc/archive/4790ab6d97e634a1ede983be393f3bb3c132b2f7.tar.gz",
         sha256 = "df83bd8a08975870b8b254c34afbecc94c51a55198e6e3a5aab61d62f40b7274",
         patches = [
-            "//thirdparty/patches:grpc-command-quoting.patch",
             "//thirdparty/patches:grpc-cython-copts.patch",
+            "//thirdparty/patches:grpc-python.patch",
         ],
     )
 

ci/travis/ci.sh

@@ -52,11 +52,6 @@ reload_env() {
     export TRAVIS_PULL_REQUEST
   fi
 
-  export PYTHON3_BIN_PATH=python
-  if [ "${OSTYPE}" = msys ]; then
-    export USE_CLANG_CL=1
-  fi
-
   # NOTE: Modifying PATH invalidates Bazel's cache! Do not add to PATH unnecessarily.
   PATH="${HOME}/miniconda/bin":"${PATH}"
   if [ "${OSTYPE}" = msys ]; then
@@ -350,7 +345,6 @@ init() {
 
   configure_system
 
-  "${ROOT_DIR}"/install-bazel.sh
   . "${ROOT_DIR}"/install-dependencies.sh
 
   cat <<EOF >> ~/.bashrc

ci/travis/install-bazel.sh

@@ -42,21 +42,20 @@ esac
   fi
 }
 
-if [ "${OSTYPE}" = "msys" ]; then
-  target="${MINGW_DIR-/usr}/bin/bazel.exe"
-  mkdir -p "${target%/*}"
-  curl -s -L -R -o "${target}" "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-${platform}-${achitecture}.exe"
-else
-  target="./install.sh"
-  curl -s -L -R -o "${target}" "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-installer-${platform}-${achitecture}.sh"
-  chmod +x "${target}"
-  if [ "${TRAVIS-}" = true ] || [ -n "${GITHUB_WORKFLOW-}" ]; then
-    sudo "${target}" > /dev/null  # system-wide install for CI
-    command -V bazel 1>&2
-  else
-    "${target}" --user > /dev/null
-  fi
-  rm -f "${target}"
+sudo=sudo
+exe_suffix=""
+bazel_target="/usr/local/bin/bazel"
+if [ "${OSTYPE}" = msys ]; then
+  sudo=""
+  exe_suffix=".exe"
+  bazel_target="${MINGW_PREFIX}/bin/bazel.exe"
+fi
+${sudo} curl -f -s -L -R -o "${bazel_target}" "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-${platform}-${achitecture}${exe_suffix}"
+${sudo} chmod +x "${bazel_target}"
+if [ "${OSTYPE}" = msys ]; then
+  ${sudo} tee /etc/profile.d/bazel.sh > /dev/null <<EOF; . /etc/profile.d/bazel.sh
+export USE_CLANG_CL=1  # Clang front-end for Visual C++
+EOF
 fi
 
 if [ "${TRAVIS-}" = true ]; then

ci/travis/install-dependencies.sh

@@ -15,6 +15,13 @@ pkg_install_helper() {
   esac
 }
 
+install_bazel() {
+  "${ROOT_DIR}"/install-bazel.sh
+  if [ -f /etc/profile.d/bazel.sh ]; then
+    . /etc/profile.d/bazel.sh
+  fi
+}
+
 install_base() {
   case "${OSTYPE}" in
     linux*)
@@ -124,6 +131,7 @@ install_node() {
 
 install_dependencies() {
 
+  install_bazel
   install_base
   if [ -n "${GITHUB_WORKFLOW-}" ]; then  # Keep Travis's built-in compilers and only use this for GitHub Actions (for now)
     "${ROOT_DIR}"/install-toolchains.sh

thirdparty/patches/grpc-python.patch

@@ -0,0 +1,23 @@
+diff --git third_party/py/python_configure.bzl third_party/py/python_configure.bzl
+--- third_party/py/python_configure.bzl
++++ third_party/py/python_configure.bzl
+@@ -163,1 +163,1 @@
+-        bash_bin_path = repository_ctx.which("bash")
++        bash_bin_path = repository_ctx.which("bash" if not _is_windows(repository_ctx) else "sh.exe")
+@@ -193,1 +193,1 @@ def _get_python_lib(repository_ctx, python_bin, lib_path_key):
+-    cmd = '%s - %s' % (python_bin, print_lib)
++    cmd = '"%s" - %s' % (python_bin, print_lib)
+@@ -275,10 +275,10 @@
+     _create_single_version_package(repository_ctx,
+                                    "_python2",
+                                    _PYTHON2_BIN_PATH,
+-                                   "python",
++                                   "python" if not _is_windows(repository_ctx) else "python.exe",
+                                    _PYTHON2_LIB_PATH)
+     _create_single_version_package(repository_ctx,
+                                    "_python3",
+                                    _PYTHON3_BIN_PATH,
+-                                   "python3",
++                                   "python3" if not _is_windows(repository_ctx) else "python.exe",
+                                    _PYTHON3_LIB_PATH)
+--