Skip to content

Commit 2d3b73e

Browse files
committed
Revert "chore: bazelrc presets (#3865)"
This reverts commit 4b4e2ec.
1 parent 7b9277f commit 2d3b73e

File tree

6 files changed

+40
-254
lines changed

6 files changed

+40
-254
lines changed

.aspect/workflows/config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# See https://docs.aspect.build/workflows/configuration
22
tasks:
33
- test:
4-
flags:
5-
- --config=ci
64
notifications:
75
github: {}

.bazelci/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
bazel: 7.3.1
2+
bazel: 7.1.1
33
# Note, this will tell the user to do the wrong thing (manually run buildifer)
44
# See https://github.com/bazelbuild/continuous-integration/issues/1161
55
buildifier:

.bazelrc

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,44 @@
1-
import %workspace%/tools/preset.bazelrc
1+
# TODO: migrate all root WORKSPACE dependencies to MODULE.bazel
2+
# https://github.com/bazel-contrib/rules_nodejs/issues/3695
3+
common --noenable_bzlmod
4+
common --enable_workspace
25

3-
common --config=ruleset
6+
# Specifies desired output mode for running tests.
7+
# Valid values are
8+
# 'summary' to output only test status summary
9+
# 'errors' to also print test logs for failed tests
10+
# 'all' to print logs for all tests
11+
# 'streamed' to output logs for all tests in real time
12+
# (this will force tests to be executed locally one at a time regardless of --test_strategy value).
13+
common --test_output=errors
14+
15+
# Turn on --incompatible_strict_action_env which was on by default
16+
# in Bazel 0.21.0 but turned off again in 0.22.0. Follow
17+
# https://github.com/bazelbuild/bazel/issues/7026 for more details.
18+
# This flag is needed to so that the bazel cache is not invalidated
19+
# when running bazel via `yarn bazel`.
20+
# See https://github.com/angular/angular/issues/27514.
21+
common --incompatible_strict_action_env
22+
23+
# Turn off legacy external runfiles
24+
# This prevents accidentally depending on this feature, which Bazel will remove.
25+
common --nolegacy_external_runfiles
26+
27+
# Don’t want to push a rules author to update their deps if not needed.
28+
# https://bazel.build/reference/command-line-reference#flag--check_direct_dependencies
29+
# https://bazelbuild.slack.com/archives/C014RARENH0/p1691158021917459?thread_ts=1691156601.420349&cid=C014RARENH0
30+
common --check_direct_dependencies=off
431

532
# In the root MODULE.bazel file we don't set include_headers on the nodejs toolchain
633
# so the `//nodejs/headers:current_node_cc_headers`` target will not build. This target
734
# is instead tested in `e2e/headers``
835
common --deleted_packages=nodejs/headers
36+
37+
# Load any settings specific to the current user.
38+
# .bazelrc.user should appear in .gitignore so that settings are not shared with team members
39+
# This needs to be last statement in this
40+
# config, as the user configuration should be able to overwrite flags from this file.
41+
# See https://docs.bazel.build/versions/master/best-practices.html#bazelrc
42+
# (Note that we use .bazelrc.user so the file appears next to .bazelrc in directory listing,
43+
# rather than user.bazelrc as suggested in the Bazel docs)
44+
try-import %workspace%/.bazelrc.user

MODULE.bazel

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ module(
88
# Lower-bounds (minimum) versions for direct runtime dependencies
99
bazel_dep(name = "bazel_lib", version = "3.0.0-beta.1")
1010
bazel_dep(name = "bazel_skylib", version = "1.4.1")
11-
12-
bazel_dep(name = "bazelrc-preset.bzl", version = "1.2.0", dev_dependency = True)
13-
1411
bazel_dep(name = "platforms", version = "0.0.5")
1512

1613
# workaround for https://github.com/bazelbuild/bazel/issues/25124
@@ -20,9 +17,7 @@ node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
2017

2118
# Note, this gets the default version of Node.js from
2219
# https://github.com/bazel-contrib/rules_nodejs/blob/main/nodejs/repositories.bzl#L11
23-
node.toolchain(
24-
node_version = "16.5.0",
25-
)
20+
node.toolchain()
2621
use_repo(node, "nodejs_toolchains")
2722

2823
# Toolchain registration under bzlmod should match the order of WORKSPACE registration

tools/BUILD

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

tools/preset.bazelrc

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

0 commit comments

Comments
 (0)