Skip to content

Commit 435f2e6

Browse files
authored
chore: switch to bazelrc-preset.bzl (#454)
* chore: switch to bazelrc-preset.bzl The one in bazel-lib should go away * restore java settings
1 parent adfa874 commit 435f2e6

File tree

14 files changed

+167
-185
lines changed

14 files changed

+167
-185
lines changed

.aspect/bazelrc/BUILD.bazel

Lines changed: 0 additions & 22 deletions
This file was deleted.

.aspect/bazelrc/bazel8.bazelrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.aspect/bazelrc/ci.bazelrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

.aspect/bazelrc/convenience.bazelrc

Lines changed: 0 additions & 28 deletions
This file was deleted.

.aspect/bazelrc/correctness.bazelrc

Lines changed: 0 additions & 64 deletions
This file was deleted.

.aspect/bazelrc/debug.bazelrc

Lines changed: 0 additions & 19 deletions
This file was deleted.

.aspect/bazelrc/javascript.bazelrc

Lines changed: 0 additions & 11 deletions
This file was deleted.

.aspect/bazelrc/performance.bazelrc

Lines changed: 0 additions & 19 deletions
This file was deleted.

.bazelrc

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
# Import Aspect bazelrc presets
2-
import %workspace%/.aspect/bazelrc/bazel8.bazelrc
3-
import %workspace%/.aspect/bazelrc/convenience.bazelrc
4-
import %workspace%/.aspect/bazelrc/correctness.bazelrc
5-
import %workspace%/.aspect/bazelrc/debug.bazelrc
6-
import %workspace%/.aspect/bazelrc/java.bazelrc
7-
import %workspace%/.aspect/bazelrc/javascript.bazelrc
8-
import %workspace%/.aspect/bazelrc/performance.bazelrc
1+
# Import bazelrc presets
2+
import %workspace%/tools/java17.bazelrc
3+
import %workspace%/tools/preset.bazelrc
94

105
### YOUR PROJECT SPECIFIC OPTIONS GO HERE ###
116

@@ -47,8 +42,8 @@ build --aspects //tools/mypy:defs.bzl%mypy_aspect
4742
# optionally, default enable the mypy checks
4843
build --output_groups=+mypy
4944

50-
# Load any settings & overrides specific to the current user from `.aspect/bazelrc/user.bazelrc`.
45+
# Load any settings & overrides specific to the current user.
5146
# This file should appear in `.gitignore` so that settings are not shared with team members. This
5247
# should be last statement in this config so the user configuration is able to overwrite flags from
5348
# this file. See https://bazel.build/configure/best-practices#bazelrc-file.
54-
try-import %workspace%/.aspect/bazelrc/user.bazelrc
49+
try-import %workspace%/user.bazelrc

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,6 @@ jobs:
139139
if: steps.has_test_sh.outputs.files_exists != 'true'
140140
run: |
141141
bazel \
142-
--bazelrc=$GITHUB_WORKSPACE/.aspect/bazelrc/ci.bazelrc \
143142
--bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc \
143+
--config=ci \
144144
test //...

0 commit comments

Comments
 (0)