From ad959828460c1d166b83b1cb9e5125ce83fbbbab Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Wed, 17 Oct 2018 23:23:10 +0000 Subject: [PATCH 1/2] bazel: add .bazelrc and use Bazel's import instead of symlinking. This is future-proofing, since %workspace%/tools/bazel.rc won't be automatically processed starting with Bazel 0.19 (October 2018). Signed-off-by: Piotr Sikora --- .bazelrc | 1 + tools/bazel.rc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .bazelrc mode change 120000 => 100644 tools/bazel.rc diff --git a/.bazelrc b/.bazelrc new file mode 100644 index 000000000..0d9d9da3c --- /dev/null +++ b/.bazelrc @@ -0,0 +1 @@ +import %workspace%/envoy/.bazelrc diff --git a/tools/bazel.rc b/tools/bazel.rc deleted file mode 120000 index bace563eb..000000000 --- a/tools/bazel.rc +++ /dev/null @@ -1 +0,0 @@ -../envoy/tools/bazel.rc \ No newline at end of file diff --git a/tools/bazel.rc b/tools/bazel.rc new file mode 100644 index 000000000..1187455c7 --- /dev/null +++ b/tools/bazel.rc @@ -0,0 +1 @@ +import %workspace%/envoy/tools/bazel.rc From c7315a5fbb4ab25107cd898129303175155228fb Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Fri, 19 Oct 2018 19:02:55 +0000 Subject: [PATCH 2/2] review: nuke tools/bazel.rc. Signed-off-by: Piotr Sikora --- tools/bazel.rc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 tools/bazel.rc diff --git a/tools/bazel.rc b/tools/bazel.rc deleted file mode 100644 index 1187455c7..000000000 --- a/tools/bazel.rc +++ /dev/null @@ -1 +0,0 @@ -import %workspace%/envoy/tools/bazel.rc