Skip to content

Commit

Permalink
fix: fixup BCR presubmit failure
Browse files Browse the repository at this point in the history
  • Loading branch information
@gregmagolan
gregmagolan committed Feb 18, 2023
1 parent 569fa37 commit 222fc0f
Show file tree
Hide file tree
Showing 35 changed files with 108 additions and 7 deletions.
1 change: 0 additions & 1 deletion e2e/bzlmod/.aspect/bazelrc
View file

This file was deleted.

1 change: 1 addition & 0 deletions e2e/bzlmod/.aspect/bazelrc/bazel6.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/bazel6.bazelrc
1 change: 1 addition & 0 deletions e2e/bzlmod/.aspect/bazelrc/convenience.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/convenience.bazelrc
1 change: 1 addition & 0 deletions e2e/bzlmod/.aspect/bazelrc/correctness.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/correctness.bazelrc
1 change: 1 addition & 0 deletions e2e/bzlmod/.aspect/bazelrc/debug.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/debug.bazelrc
1 change: 1 addition & 0 deletions e2e/bzlmod/.aspect/bazelrc/javascript.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/javascript.bazelrc
1 change: 1 addition & 0 deletions e2e/bzlmod/.aspect/bazelrc/performance.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/performance.bazelrc
1 change: 0 additions & 1 deletion e2e/bzlmod/.bazelignore
View file

This file was deleted.

23 changes: 22 additions & 1 deletion e2e/bzlmod/.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -1 +1,22 @@
common --experimental_enable_bzlmod
# 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
1 change: 1 addition & 0 deletions e2e/bzlmod_write_source_files_external/.aspect/bazelrc/bazel6.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/bazel6.bazelrc
1 change: 1 addition & 0 deletions e2e/bzlmod_write_source_files_external/.aspect/bazelrc/convenience.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/convenience.bazelrc
1 change: 1 addition & 0 deletions e2e/bzlmod_write_source_files_external/.aspect/bazelrc/correctness.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/correctness.bazelrc
1 change: 1 addition & 0 deletions e2e/bzlmod_write_source_files_external/.aspect/bazelrc/debug.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/debug.bazelrc
1 change: 1 addition & 0 deletions e2e/bzlmod_write_source_files_external/.aspect/bazelrc/javascript.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/javascript.bazelrc
1 change: 1 addition & 0 deletions e2e/bzlmod_write_source_files_external/.aspect/bazelrc/performance.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/performance.bazelrc
1 change: 1 addition & 0 deletions e2e/bzlmod_write_source_files_external/.aspect/cli
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../.aspect/cli
21 changes: 21 additions & 0 deletions e2e/bzlmod_write_source_files_external/.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion e2e/copy_to_directory/.aspect/bazelrc
View file

This file was deleted.

1 change: 1 addition & 0 deletions e2e/copy_to_directory/.aspect/bazelrc/bazel6.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/bazel6.bazelrc
1 change: 1 addition & 0 deletions e2e/copy_to_directory/.aspect/bazelrc/convenience.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/convenience.bazelrc
1 change: 1 addition & 0 deletions e2e/copy_to_directory/.aspect/bazelrc/correctness.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/correctness.bazelrc
1 change: 1 addition & 0 deletions e2e/copy_to_directory/.aspect/bazelrc/debug.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/debug.bazelrc
1 change: 1 addition & 0 deletions e2e/copy_to_directory/.aspect/bazelrc/javascript.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/javascript.bazelrc
1 change: 1 addition & 0 deletions e2e/copy_to_directory/.aspect/bazelrc/performance.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/performance.bazelrc
1 change: 0 additions & 1 deletion e2e/copy_to_directory/.bazelignore
View file

This file was deleted.

20 changes: 20 additions & 0 deletions e2e/copy_to_directory/.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion e2e/workspace/.aspect/bazelrc
View file

This file was deleted.

1 change: 1 addition & 0 deletions e2e/workspace/.aspect/bazelrc/bazel6.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/bazel6.bazelrc
1 change: 1 addition & 0 deletions e2e/workspace/.aspect/bazelrc/convenience.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/convenience.bazelrc
1 change: 1 addition & 0 deletions e2e/workspace/.aspect/bazelrc/correctness.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/correctness.bazelrc
1 change: 1 addition & 0 deletions e2e/workspace/.aspect/bazelrc/debug.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/debug.bazelrc
1 change: 1 addition & 0 deletions e2e/workspace/.aspect/bazelrc/javascript.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/javascript.bazelrc
1 change: 1 addition & 0 deletions e2e/workspace/.aspect/bazelrc/performance.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../.aspect/bazelrc/performance.bazelrc
1 change: 0 additions & 1 deletion e2e/workspace/.bazelignore
View file

This file was deleted.

20 changes: 20 additions & 0 deletions e2e/workspace/.bazelrc
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 222fc0f

Please sign in to comment.