From 53a5bee85815d30e21dd4b812242d371b66fadbe Mon Sep 17 00:00:00 2001 From: Chloe Calvarin Date: Fri, 3 Aug 2018 14:43:28 -0400 Subject: [PATCH 1/3] Create .bazelrc See bazelbuild/bazel#5756 --- .bazelrc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .bazelrc diff --git a/.bazelrc b/.bazelrc new file mode 100644 index 000000000..b0b6e98cc --- /dev/null +++ b/.bazelrc @@ -0,0 +1,3 @@ +# Import the old rc file. In the future, remove it and migrate its contents +# to this file. For now, we keep both for backwards compatibility. +import %workspace%/tools/bazel.rc From ac656fe3f00bf0d6abbb1bb8c07f1fecbc0f2fbd Mon Sep 17 00:00:00 2001 From: Chloe Calvarin Date: Fri, 3 Aug 2018 15:19:58 -0400 Subject: [PATCH 2/3] Add the .bazelrc import for buildkite It would be nicer to simply change the "mv" command, but I'm not 100% sure that this would always run with HEAD bazel, so this provides some duality if both formats need to be supported concurrently. --- .bazelci/presubmit.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 0bd65bce6..bed8b7860 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -4,6 +4,7 @@ platforms: shell_commands: # Disable local disk caching on CI. - mv tools/bazel.rc.buildkite tools/bazel.rc + - echo "import %workspace%/tools/bazel.rc" > .bazelrc build_targets: - "//test/..." test_targets: @@ -12,6 +13,7 @@ platforms: shell_commands: # Disable local disk caching on CI. - mv tools/bazel.rc.buildkite tools/bazel.rc + - echo "import %workspace%/tools/bazel.rc" > .bazelrc build_targets: - "//test/..." test_targets: @@ -20,6 +22,7 @@ platforms: shell_commands: # Disable local disk caching on CI. - mv tools/bazel.rc.buildkite tools/bazel.rc + - echo "import %workspace%/tools/bazel.rc" > .bazelrc build_targets: - "//test/..." test_targets: From 7d90045444677ac744435e78e6bf3ab217982080 Mon Sep 17 00:00:00 2001 From: Chloe Calvarin Date: Fri, 3 Aug 2018 15:20:38 -0400 Subject: [PATCH 3/3] Delete .bazelrc It conflicts with the travis setup. --- .bazelrc | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .bazelrc diff --git a/.bazelrc b/.bazelrc deleted file mode 100644 index b0b6e98cc..000000000 --- a/.bazelrc +++ /dev/null @@ -1,3 +0,0 @@ -# Import the old rc file. In the future, remove it and migrate its contents -# to this file. For now, we keep both for backwards compatibility. -import %workspace%/tools/bazel.rc