From 117ca7cf3918da295701b61f5a82cf2b9bb85f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matias=20Niemel=C3=A4?= Date: Fri, 18 Oct 2019 08:56:41 -0700 Subject: [PATCH] revert: build: use http caching on windows CI runs (#33238) (#33254) This reverts commit 7fb55f29b6fc55de4f604751a3ec26210d35eb7d. PR Close #33254 --- .circleci/bazel.windows.rc | 6 ------ .circleci/config.yml | 5 ----- 2 files changed, 11 deletions(-) diff --git a/.circleci/bazel.windows.rc b/.circleci/bazel.windows.rc index 2e1680613a..903bf89e12 100644 --- a/.circleci/bazel.windows.rc +++ b/.circleci/bazel.windows.rc @@ -9,9 +9,3 @@ import %workspace%/.circleci/bazel.common.rc # Save downloaded repositories in a location that can be cached by CircleCI. This helps us # speeding up the analysis time significantly with Bazel managed node dependencies on the CI. build --repository_cache=C:/Users/circleci/bazel_repository_cache - -# All windows jobs run on master and should use http caching -build --config=remote-http-caching - -# TODO(josephperrott): remove after #33109 lands -build --google_default_credentials diff --git a/.circleci/config.yml b/.circleci/config.yml index eb0cc4d576..e2140dc0fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -172,11 +172,6 @@ commands: description: Set up CircleCI bazel configuration on Windows steps: - run: copy .circleci\bazel.windows.rc $env:USERPROFILE\.bazelrc - - run: mkdir %APPDATA%\gcloud - # We need ensure that the same default digest is used for encoding and decoding - # with openssl. Openssl versions might have different default digests which can - # cause decryption failures based on the openssl version. https://stackoverflow.com/a/39641378/4317734 - - run: openssl aes-256-cbc -d -in .circleci/gcp_token -md md5 -k "$CI_REPO_NAME" -out %APPDATA%/gcloud/application_default_credentials.json setup_bazel_rbe: description: Setup bazel RBE remote execution