From a8ee0ed7fcfc91209f59719f98a0495753bf6af7 Mon Sep 17 00:00:00 2001 From: simon-mo Date: Mon, 15 Feb 2021 13:06:25 -0800 Subject: [PATCH] update --- .buildkite/Dockerfile | 2 ++ ci/travis/ci.sh | 2 ++ ci/travis/install-bazel.sh | 4 ++++ python/ray/serve/utils.py | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.buildkite/Dockerfile b/.buildkite/Dockerfile index ff791b461..d72e56f0d 100644 --- a/.buildkite/Dockerfile +++ b/.buildkite/Dockerfile @@ -22,6 +22,8 @@ ENV DOCKER_TLS_CERTDIR=/certs ENV DOCKER_HOST=tcp://docker:2376 ENV DOCKER_TLS_VERIFY=1 ENV DOCKER_CERT_PATH=/certs/client +ENV TRAVIS_COMMIT=${BUILDKITE_COMMIT} +ENV BUILDKITE_BAZEL_CACHE_URL=${REMOTE_CACHE_URL} RUN apt-get update -qq RUN apt-get install -y -qq \ diff --git a/ci/travis/ci.sh b/ci/travis/ci.sh index 9324853fe..075015f23 100755 --- a/ci/travis/ci.sh +++ b/ci/travis/ci.sh @@ -313,6 +313,8 @@ build_wheels() { -e "TRAVIS_COMMIT=${TRAVIS_COMMIT}" -e "CI=${CI}" -e "RAY_INSTALL_JAVA=${RAY_INSTALL_JAVA:-}" + -e "BUILDKITE=${BUILDKITE:-}" + -e "BUILDKITE_BAZEL_CACHE_URL=$=${BUILDKITE_BAZEL_CACHE_URL=$:-}" ) # This command should be kept in sync with ray/python/README-building-wheels.md, diff --git a/ci/travis/install-bazel.sh b/ci/travis/install-bazel.sh index 1f125de66..ee4715555 100755 --- a/ci/travis/install-bazel.sh +++ b/ci/travis/install-bazel.sh @@ -117,6 +117,10 @@ build --google_credentials="${translated_path}" EOF elif [ -n "${BUILDKITE-}" ]; then echo "Using buildkite secret store to communicate with cache address" + + cat <> ~/.bazelrc +build --remote_cache=${BUILDKITE_BAZEL_CACHE_URL=$} +EOF else echo "Using remote build cache in read-only mode." 1>&2 cat <> ~/.bazelrc diff --git a/python/ray/serve/utils.py b/python/ray/serve/utils.py index 1d19593e6..6ebdf3b46 100644 --- a/python/ray/serve/utils.py +++ b/python/ray/serve/utils.py @@ -378,7 +378,7 @@ def import_attr(full_path: str): async def mock_imported_function(batch): - return [await request.body() for request in batch] + return [ await request.body() for request in batch] class MockImportedBackend: