From 67cd9a0c95932821dfd31c04c8fc3de148e29ab7 Mon Sep 17 00:00:00 2001
From: mehrdadn <mehrdadn@users.noreply.github.com>
Date: Tue, 9 Jun 2020 14:07:54 -0700
Subject: [PATCH] CI fixes and improvements (#8849)

Co-authored-by: Mehrdad <noreply@github.com>
---
 .bazelrc                          | 3 +--
 ci/travis/ci.sh                   | 2 +-
 ci/travis/install-dependencies.sh | 7 ++++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 4539a1f38..7800d4459 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -7,6 +7,7 @@ build --enable_platform_specific_config
 build --action_env=PATH
 # For --compilation_mode=dbg, consider enabling checks in the standard library as well (below).
 build --compilation_mode=opt
+build --experimental_ui_deduplicate
 # This workaround is needed to prevent Bazel from compiling the same file twice (once PIC and once not).
 build:linux --force_pic
 build:macos --force_pic
@@ -36,8 +37,6 @@ build:iwyu --experimental_action_listener=//:iwyu_cpp
 build:windows --attempt_to_print_relative_paths
 # Save disk space by hardlinking cache hits instead of copying
 build:windows --experimental_repository_cache_hardlinks
-# Avoid duplicate noise in the build output
-build:windows --experimental_ui_deduplicate
 # Clean the environment before building, to make builds more deterministic
 build:windows --incompatible_strict_action_env
 # For colored output (seems necessary on Windows)
diff --git a/ci/travis/ci.sh b/ci/travis/ci.sh
index 689f69349..e9b7e14bf 100755
--- a/ci/travis/ci.sh
+++ b/ci/travis/ci.sh
@@ -248,7 +248,7 @@ build_wheels() {
           local existing_version
           existing_version="$(python -s -c "import sys; print('%s.%s' % sys.version_info[:2])")"
           if [ "${pyversion}" != "${existing_version}" ]; then
-            suppress_xtrace conda install python="${pyversion}"
+            suppress_output conda install python="${pyversion}"
           fi
           install_ray
           (cd "${WORKSPACE_DIR}"/python && python setup.py --quiet bdist_wheel)
diff --git a/ci/travis/install-dependencies.sh b/ci/travis/install-dependencies.sh
index 3bebcb540..24dc2c5dd 100755
--- a/ci/travis/install-dependencies.sh
+++ b/ci/travis/install-dependencies.sh
@@ -32,6 +32,8 @@ install_bazel() {
 install_base() {
   case "${OSTYPE}" in
     linux*)
+      # Expired apt key error: https://github.com/bazelbuild/bazel/issues/11470#issuecomment-633205152
+      curl -f -s -L -R https://bazel.build/bazel-release.pub.gpg | sudo apt-key add - || true
       sudo apt-get update -qq
       pkg_install_helper build-essential curl unzip libunwind-dev python3-pip python3-setuptools \
         tmux gdb
@@ -88,8 +90,7 @@ install_miniconda() {
         mkdir -p -- "${miniconda_dir}"
         # We're forced to pass -b for non-interactive mode.
         # Unfortunately it inhibits PATH modifications as a side effect.
-        "${miniconda_target}" -f -b -p "${miniconda_dir}" | grep --line-buffered -v \
-          '^\(reinstalling: \|installing: \|using -f (force) option\|installation finished\.\|$\)'
+        "${WORKSPACE_DIR}"/ci/suppress_output "${miniconda_target}" -f -b -p "${miniconda_dir}"
         conda="${miniconda_dir}/bin/conda"
         ;;
     esac
@@ -113,7 +114,7 @@ install_miniconda() {
     (
       set +x
       echo "Updating Anaconda Python ${python_version} to ${PYTHON}..."
-      conda install -q -y python="${PYTHON}"
+      "${WORKSPACE_DIR}"/ci/suppress_output conda install -q -y python="${PYTHON}"
     )
   fi