From b543f30eb3d5539b120a7bad81f6832b46f6d832 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Fri, 17 Feb 2023 16:45:57 -0800 Subject: [PATCH] fix: fixup BCR presubmit failure (#373) --- e2e/bzlmod/.aspect/bazelrc | 1 - e2e/bzlmod/.aspect/bazelrc/bazel6.bazelrc | 1 + .../.aspect/bazelrc/convenience.bazelrc | 1 + .../.aspect/bazelrc/correctness.bazelrc | 1 + e2e/bzlmod/.aspect/bazelrc/debug.bazelrc | 1 + e2e/bzlmod/.aspect/bazelrc/javascript.bazelrc | 1 + .../.aspect/bazelrc/performance.bazelrc | 1 + e2e/bzlmod/.bazelignore | 1 - e2e/bzlmod/.bazelrc | 21 +++++++++++++++++++ .../.aspect/bazelrc/bazel6.bazelrc | 1 + .../.aspect/bazelrc/convenience.bazelrc | 1 + .../.aspect/bazelrc/correctness.bazelrc | 1 + .../.aspect/bazelrc/debug.bazelrc | 1 + .../.aspect/bazelrc/javascript.bazelrc | 1 + .../.aspect/bazelrc/performance.bazelrc | 1 + .../.aspect/cli | 1 + .../.bazelrc | 21 +++++++++++++++++++ e2e/copy_to_directory/.aspect/bazelrc | 1 - .../.aspect/bazelrc/bazel6.bazelrc | 1 + .../.aspect/bazelrc/convenience.bazelrc | 1 + .../.aspect/bazelrc/correctness.bazelrc | 1 + .../.aspect/bazelrc/debug.bazelrc | 1 + .../.aspect/bazelrc/javascript.bazelrc | 1 + .../.aspect/bazelrc/performance.bazelrc | 1 + e2e/copy_to_directory/.bazelignore | 1 - e2e/copy_to_directory/.bazelrc | 20 ++++++++++++++++++ e2e/workspace/.aspect/bazelrc | 1 - e2e/workspace/.aspect/bazelrc/bazel6.bazelrc | 1 + .../.aspect/bazelrc/convenience.bazelrc | 1 + .../.aspect/bazelrc/correctness.bazelrc | 1 + e2e/workspace/.aspect/bazelrc/debug.bazelrc | 1 + .../.aspect/bazelrc/javascript.bazelrc | 1 + .../.aspect/bazelrc/performance.bazelrc | 1 + e2e/workspace/.bazelignore | 1 - e2e/workspace/.bazelrc | 20 ++++++++++++++++++ 35 files changed, 107 insertions(+), 6 deletions(-) delete mode 120000 e2e/bzlmod/.aspect/bazelrc create mode 120000 e2e/bzlmod/.aspect/bazelrc/bazel6.bazelrc create mode 120000 e2e/bzlmod/.aspect/bazelrc/convenience.bazelrc create mode 120000 e2e/bzlmod/.aspect/bazelrc/correctness.bazelrc create mode 120000 e2e/bzlmod/.aspect/bazelrc/debug.bazelrc create mode 120000 e2e/bzlmod/.aspect/bazelrc/javascript.bazelrc create mode 120000 e2e/bzlmod/.aspect/bazelrc/performance.bazelrc delete mode 100644 e2e/bzlmod/.bazelignore create mode 120000 e2e/bzlmod_write_source_files_external/.aspect/bazelrc/bazel6.bazelrc create mode 120000 e2e/bzlmod_write_source_files_external/.aspect/bazelrc/convenience.bazelrc create mode 120000 e2e/bzlmod_write_source_files_external/.aspect/bazelrc/correctness.bazelrc create mode 120000 e2e/bzlmod_write_source_files_external/.aspect/bazelrc/debug.bazelrc create mode 120000 e2e/bzlmod_write_source_files_external/.aspect/bazelrc/javascript.bazelrc create mode 120000 e2e/bzlmod_write_source_files_external/.aspect/bazelrc/performance.bazelrc create mode 120000 e2e/bzlmod_write_source_files_external/.aspect/cli delete mode 120000 e2e/copy_to_directory/.aspect/bazelrc create mode 120000 e2e/copy_to_directory/.aspect/bazelrc/bazel6.bazelrc create mode 120000 e2e/copy_to_directory/.aspect/bazelrc/convenience.bazelrc create mode 120000 e2e/copy_to_directory/.aspect/bazelrc/correctness.bazelrc create mode 120000 e2e/copy_to_directory/.aspect/bazelrc/debug.bazelrc create mode 120000 e2e/copy_to_directory/.aspect/bazelrc/javascript.bazelrc create mode 120000 e2e/copy_to_directory/.aspect/bazelrc/performance.bazelrc delete mode 100644 e2e/copy_to_directory/.bazelignore delete mode 120000 e2e/workspace/.aspect/bazelrc create mode 120000 e2e/workspace/.aspect/bazelrc/bazel6.bazelrc create mode 120000 e2e/workspace/.aspect/bazelrc/convenience.bazelrc create mode 120000 e2e/workspace/.aspect/bazelrc/correctness.bazelrc create mode 120000 e2e/workspace/.aspect/bazelrc/debug.bazelrc create mode 120000 e2e/workspace/.aspect/bazelrc/javascript.bazelrc create mode 120000 e2e/workspace/.aspect/bazelrc/performance.bazelrc delete mode 100644 e2e/workspace/.bazelignore diff --git a/e2e/bzlmod/.aspect/bazelrc b/e2e/bzlmod/.aspect/bazelrc deleted file mode 120000 index 2d2e61f..0000000 --- a/e2e/bzlmod/.aspect/bazelrc +++ /dev/null @@ -1 +0,0 @@ -../../../.aspect/bazelrc \ No newline at end of file diff --git a/e2e/bzlmod/.aspect/bazelrc/bazel6.bazelrc b/e2e/bzlmod/.aspect/bazelrc/bazel6.bazelrc new file mode 120000 index 0000000..eed5e30 --- /dev/null +++ b/e2e/bzlmod/.aspect/bazelrc/bazel6.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/bazel6.bazelrc \ No newline at end of file diff --git a/e2e/bzlmod/.aspect/bazelrc/convenience.bazelrc b/e2e/bzlmod/.aspect/bazelrc/convenience.bazelrc new file mode 120000 index 0000000..524b51f --- /dev/null +++ b/e2e/bzlmod/.aspect/bazelrc/convenience.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/convenience.bazelrc \ No newline at end of file diff --git a/e2e/bzlmod/.aspect/bazelrc/correctness.bazelrc b/e2e/bzlmod/.aspect/bazelrc/correctness.bazelrc new file mode 120000 index 0000000..f139b5d --- /dev/null +++ b/e2e/bzlmod/.aspect/bazelrc/correctness.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/correctness.bazelrc \ No newline at end of file diff --git a/e2e/bzlmod/.aspect/bazelrc/debug.bazelrc b/e2e/bzlmod/.aspect/bazelrc/debug.bazelrc new file mode 120000 index 0000000..e9fb0cf --- /dev/null +++ b/e2e/bzlmod/.aspect/bazelrc/debug.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/debug.bazelrc \ No newline at end of file diff --git a/e2e/bzlmod/.aspect/bazelrc/javascript.bazelrc b/e2e/bzlmod/.aspect/bazelrc/javascript.bazelrc new file mode 120000 index 0000000..6981085 --- /dev/null +++ b/e2e/bzlmod/.aspect/bazelrc/javascript.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/javascript.bazelrc \ No newline at end of file diff --git a/e2e/bzlmod/.aspect/bazelrc/performance.bazelrc b/e2e/bzlmod/.aspect/bazelrc/performance.bazelrc new file mode 120000 index 0000000..719484d --- /dev/null +++ b/e2e/bzlmod/.aspect/bazelrc/performance.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/performance.bazelrc \ No newline at end of file diff --git a/e2e/bzlmod/.bazelignore b/e2e/bzlmod/.bazelignore deleted file mode 100644 index 9877b31..0000000 --- a/e2e/bzlmod/.bazelignore +++ /dev/null @@ -1 +0,0 @@ -e2e/bzlmod/.aspect/bazelrc diff --git a/e2e/bzlmod/.bazelrc b/e2e/bzlmod/.bazelrc index b3a24e8..ddbbd92 100644 --- a/e2e/bzlmod/.bazelrc +++ b/e2e/bzlmod/.bazelrc @@ -1 +1,22 @@ +# Bazel settings that apply to this repository. +# Settings that apply only to CI are in .aspect/bazelrc/ci.bazelrc + +# Import Aspect bazelrc presets +import %workspace%/.aspect/bazelrc/convenience.bazelrc +import %workspace%/.aspect/bazelrc/correctness.bazelrc +import %workspace%/.aspect/bazelrc/performance.bazelrc +import %workspace%/.aspect/bazelrc/debug.bazelrc +import %workspace%/.aspect/bazelrc/javascript.bazelrc + +# Use a try-import for Bazel 6 settings since this repository is also tested against Bazel 5 on CI +try-import %workspace%/.aspect/bazelrc/bazel6.bazelrc + +### PROJECT SPECIFIC OPTIONS ### + common --experimental_enable_bzlmod + +# Load any settings & overrides specific to the current user from `.aspect/bazelrc/user.bazelrc`. +# This file should appear in `.gitignore` so that settings are not shared with team members. This +# should be last statement in this config so the user configuration is able to overwrite flags from +# this file. See https://bazel.build/configure/best-practices#bazelrc-file. +try-import %workspace%/.aspect/bazelrc/user.bazelrc diff --git a/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/bazel6.bazelrc b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/bazel6.bazelrc new file mode 120000 index 0000000..eed5e30 --- /dev/null +++ b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/bazel6.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/bazel6.bazelrc \ No newline at end of file diff --git a/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/convenience.bazelrc b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/convenience.bazelrc new file mode 120000 index 0000000..524b51f --- /dev/null +++ b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/convenience.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/convenience.bazelrc \ No newline at end of file diff --git a/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/correctness.bazelrc b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/correctness.bazelrc new file mode 120000 index 0000000..f139b5d --- /dev/null +++ b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/correctness.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/correctness.bazelrc \ No newline at end of file diff --git a/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/debug.bazelrc b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/debug.bazelrc new file mode 120000 index 0000000..e9fb0cf --- /dev/null +++ b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/debug.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/debug.bazelrc \ No newline at end of file diff --git a/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/javascript.bazelrc b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/javascript.bazelrc new file mode 120000 index 0000000..6981085 --- /dev/null +++ b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/javascript.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/javascript.bazelrc \ No newline at end of file diff --git a/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/performance.bazelrc b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/performance.bazelrc new file mode 120000 index 0000000..719484d --- /dev/null +++ b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/performance.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/performance.bazelrc \ No newline at end of file diff --git a/e2e/bzlmod_write_source_files_external/.aspect/cli b/e2e/bzlmod_write_source_files_external/.aspect/cli new file mode 120000 index 0000000..0754375 --- /dev/null +++ b/e2e/bzlmod_write_source_files_external/.aspect/cli @@ -0,0 +1 @@ +../../../.aspect/cli \ No newline at end of file diff --git a/e2e/bzlmod_write_source_files_external/.bazelrc b/e2e/bzlmod_write_source_files_external/.bazelrc index 3ce91d2..a1b3c00 100644 --- a/e2e/bzlmod_write_source_files_external/.bazelrc +++ b/e2e/bzlmod_write_source_files_external/.bazelrc @@ -1 +1,22 @@ +# Bazel settings that apply to this repository. +# Settings that apply only to CI are in .aspect/bazelrc/ci.bazelrc + +# Import Aspect bazelrc presets +import %workspace%/.aspect/bazelrc/convenience.bazelrc +import %workspace%/.aspect/bazelrc/correctness.bazelrc +import %workspace%/.aspect/bazelrc/performance.bazelrc +import %workspace%/.aspect/bazelrc/debug.bazelrc +import %workspace%/.aspect/bazelrc/javascript.bazelrc + +# Use a try-import for Bazel 6 settings since this repository is also tested against Bazel 5 on CI +try-import %workspace%/.aspect/bazelrc/bazel6.bazelrc + +### PROJECT SPECIFIC OPTIONS ### + common --enable_bzlmod + +# Load any settings & overrides specific to the current user from `.aspect/bazelrc/user.bazelrc`. +# This file should appear in `.gitignore` so that settings are not shared with team members. This +# should be last statement in this config so the user configuration is able to overwrite flags from +# this file. See https://bazel.build/configure/best-practices#bazelrc-file. +try-import %workspace%/.aspect/bazelrc/user.bazelrc diff --git a/e2e/copy_to_directory/.aspect/bazelrc b/e2e/copy_to_directory/.aspect/bazelrc deleted file mode 120000 index 2d2e61f..0000000 --- a/e2e/copy_to_directory/.aspect/bazelrc +++ /dev/null @@ -1 +0,0 @@ -../../../.aspect/bazelrc \ No newline at end of file diff --git a/e2e/copy_to_directory/.aspect/bazelrc/bazel6.bazelrc b/e2e/copy_to_directory/.aspect/bazelrc/bazel6.bazelrc new file mode 120000 index 0000000..eed5e30 --- /dev/null +++ b/e2e/copy_to_directory/.aspect/bazelrc/bazel6.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/bazel6.bazelrc \ No newline at end of file diff --git a/e2e/copy_to_directory/.aspect/bazelrc/convenience.bazelrc b/e2e/copy_to_directory/.aspect/bazelrc/convenience.bazelrc new file mode 120000 index 0000000..524b51f --- /dev/null +++ b/e2e/copy_to_directory/.aspect/bazelrc/convenience.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/convenience.bazelrc \ No newline at end of file diff --git a/e2e/copy_to_directory/.aspect/bazelrc/correctness.bazelrc b/e2e/copy_to_directory/.aspect/bazelrc/correctness.bazelrc new file mode 120000 index 0000000..f139b5d --- /dev/null +++ b/e2e/copy_to_directory/.aspect/bazelrc/correctness.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/correctness.bazelrc \ No newline at end of file diff --git a/e2e/copy_to_directory/.aspect/bazelrc/debug.bazelrc b/e2e/copy_to_directory/.aspect/bazelrc/debug.bazelrc new file mode 120000 index 0000000..e9fb0cf --- /dev/null +++ b/e2e/copy_to_directory/.aspect/bazelrc/debug.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/debug.bazelrc \ No newline at end of file diff --git a/e2e/copy_to_directory/.aspect/bazelrc/javascript.bazelrc b/e2e/copy_to_directory/.aspect/bazelrc/javascript.bazelrc new file mode 120000 index 0000000..6981085 --- /dev/null +++ b/e2e/copy_to_directory/.aspect/bazelrc/javascript.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/javascript.bazelrc \ No newline at end of file diff --git a/e2e/copy_to_directory/.aspect/bazelrc/performance.bazelrc b/e2e/copy_to_directory/.aspect/bazelrc/performance.bazelrc new file mode 120000 index 0000000..719484d --- /dev/null +++ b/e2e/copy_to_directory/.aspect/bazelrc/performance.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/performance.bazelrc \ No newline at end of file diff --git a/e2e/copy_to_directory/.bazelignore b/e2e/copy_to_directory/.bazelignore deleted file mode 100644 index 9877b31..0000000 --- a/e2e/copy_to_directory/.bazelignore +++ /dev/null @@ -1 +0,0 @@ -e2e/bzlmod/.aspect/bazelrc diff --git a/e2e/copy_to_directory/.bazelrc b/e2e/copy_to_directory/.bazelrc index e69de29..11c53fe 100644 --- a/e2e/copy_to_directory/.bazelrc +++ b/e2e/copy_to_directory/.bazelrc @@ -0,0 +1,20 @@ +# Bazel settings that apply to this repository. +# Settings that apply only to CI are in .aspect/bazelrc/ci.bazelrc + +# Import Aspect bazelrc presets +import %workspace%/.aspect/bazelrc/convenience.bazelrc +import %workspace%/.aspect/bazelrc/correctness.bazelrc +import %workspace%/.aspect/bazelrc/performance.bazelrc +import %workspace%/.aspect/bazelrc/debug.bazelrc +import %workspace%/.aspect/bazelrc/javascript.bazelrc + +# Use a try-import for Bazel 6 settings since this repository is also tested against Bazel 5 on CI +try-import %workspace%/.aspect/bazelrc/bazel6.bazelrc + +### PROJECT SPECIFIC OPTIONS ### + +# Load any settings & overrides specific to the current user from `.aspect/bazelrc/user.bazelrc`. +# This file should appear in `.gitignore` so that settings are not shared with team members. This +# should be last statement in this config so the user configuration is able to overwrite flags from +# this file. See https://bazel.build/configure/best-practices#bazelrc-file. +try-import %workspace%/.aspect/bazelrc/user.bazelrc diff --git a/e2e/workspace/.aspect/bazelrc b/e2e/workspace/.aspect/bazelrc deleted file mode 120000 index 2d2e61f..0000000 --- a/e2e/workspace/.aspect/bazelrc +++ /dev/null @@ -1 +0,0 @@ -../../../.aspect/bazelrc \ No newline at end of file diff --git a/e2e/workspace/.aspect/bazelrc/bazel6.bazelrc b/e2e/workspace/.aspect/bazelrc/bazel6.bazelrc new file mode 120000 index 0000000..eed5e30 --- /dev/null +++ b/e2e/workspace/.aspect/bazelrc/bazel6.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/bazel6.bazelrc \ No newline at end of file diff --git a/e2e/workspace/.aspect/bazelrc/convenience.bazelrc b/e2e/workspace/.aspect/bazelrc/convenience.bazelrc new file mode 120000 index 0000000..524b51f --- /dev/null +++ b/e2e/workspace/.aspect/bazelrc/convenience.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/convenience.bazelrc \ No newline at end of file diff --git a/e2e/workspace/.aspect/bazelrc/correctness.bazelrc b/e2e/workspace/.aspect/bazelrc/correctness.bazelrc new file mode 120000 index 0000000..f139b5d --- /dev/null +++ b/e2e/workspace/.aspect/bazelrc/correctness.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/correctness.bazelrc \ No newline at end of file diff --git a/e2e/workspace/.aspect/bazelrc/debug.bazelrc b/e2e/workspace/.aspect/bazelrc/debug.bazelrc new file mode 120000 index 0000000..e9fb0cf --- /dev/null +++ b/e2e/workspace/.aspect/bazelrc/debug.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/debug.bazelrc \ No newline at end of file diff --git a/e2e/workspace/.aspect/bazelrc/javascript.bazelrc b/e2e/workspace/.aspect/bazelrc/javascript.bazelrc new file mode 120000 index 0000000..6981085 --- /dev/null +++ b/e2e/workspace/.aspect/bazelrc/javascript.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/javascript.bazelrc \ No newline at end of file diff --git a/e2e/workspace/.aspect/bazelrc/performance.bazelrc b/e2e/workspace/.aspect/bazelrc/performance.bazelrc new file mode 120000 index 0000000..719484d --- /dev/null +++ b/e2e/workspace/.aspect/bazelrc/performance.bazelrc @@ -0,0 +1 @@ +../../../../.aspect/bazelrc/performance.bazelrc \ No newline at end of file diff --git a/e2e/workspace/.bazelignore b/e2e/workspace/.bazelignore deleted file mode 100644 index 9877b31..0000000 --- a/e2e/workspace/.bazelignore +++ /dev/null @@ -1 +0,0 @@ -e2e/bzlmod/.aspect/bazelrc diff --git a/e2e/workspace/.bazelrc b/e2e/workspace/.bazelrc index e69de29..11c53fe 100644 --- a/e2e/workspace/.bazelrc +++ b/e2e/workspace/.bazelrc @@ -0,0 +1,20 @@ +# Bazel settings that apply to this repository. +# Settings that apply only to CI are in .aspect/bazelrc/ci.bazelrc + +# Import Aspect bazelrc presets +import %workspace%/.aspect/bazelrc/convenience.bazelrc +import %workspace%/.aspect/bazelrc/correctness.bazelrc +import %workspace%/.aspect/bazelrc/performance.bazelrc +import %workspace%/.aspect/bazelrc/debug.bazelrc +import %workspace%/.aspect/bazelrc/javascript.bazelrc + +# Use a try-import for Bazel 6 settings since this repository is also tested against Bazel 5 on CI +try-import %workspace%/.aspect/bazelrc/bazel6.bazelrc + +### PROJECT SPECIFIC OPTIONS ### + +# Load any settings & overrides specific to the current user from `.aspect/bazelrc/user.bazelrc`. +# This file should appear in `.gitignore` so that settings are not shared with team members. This +# should be last statement in this config so the user configuration is able to overwrite flags from +# this file. See https://bazel.build/configure/best-practices#bazelrc-file. +try-import %workspace%/.aspect/bazelrc/user.bazelrc