Skip to content

Make every .bazelrc import the top level .bazelrc #1644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 12, 2024
Merged

Make every .bazelrc import the top level .bazelrc #1644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions examples/crossbuild/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# Remove upon completing Bzlmod compatibility work.
# - https://github.com/bazelbuild/rules_scala/issues/1482
build --noenable_bzlmod
import ../../.bazelrc
4 changes: 1 addition & 3 deletions examples/scala3/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# Remove upon completing Bzlmod compatibility work.
# - https://github.com/bazelbuild/rules_scala/issues/1482
build --noenable_bzlmod
import ../../.bazelrc
4 changes: 1 addition & 3 deletions examples/semanticdb/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# Remove upon completing Bzlmod compatibility work.
# - https://github.com/bazelbuild/rules_scala/issues/1482
build --noenable_bzlmod
import ../../.bazelrc
7 changes: 1 addition & 6 deletions examples/testing/multi_frameworks_toolchain/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
build --enable_platform_specific_config
windows:build --enable_runfiles

# Remove upon completing Bzlmod compatibility work.
# - https://github.com/bazelbuild/rules_scala/issues/1482
build --noenable_bzlmod
import ../../../.bazelrc
4 changes: 1 addition & 3 deletions examples/testing/scalatest_repositories/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# Remove upon completing Bzlmod compatibility work.
# - https://github.com/bazelbuild/rules_scala/issues/1482
build --noenable_bzlmod
import ../../../.bazelrc
7 changes: 1 addition & 6 deletions examples/testing/specs2_junit_repositories/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
build --enable_platform_specific_config
windows:build --enable_runfiles

# Remove upon completing Bzlmod compatibility work.
# - https://github.com/bazelbuild/rules_scala/issues/1482
build --noenable_bzlmod
import ../../../.bazelrc
2 changes: 1 addition & 1 deletion scripts/sync-bazelversion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ while IFS="" read repo_marker_path; do
if [[ "$repo_path" != "$repo_marker_path" ]]; then
cp .bazelversion "$repo_path"
fi
done < <(find [A-Za-z0-9]* \( -name "WORKSPACE*" -or -name "MODULE.bazel" \))
done < <(find [A-Za-z0-9]* \( -name "WORKSPACE" -or -name "MODULE.bazel" \))
2 changes: 1 addition & 1 deletion test/shell/test_scala_proto_library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ test_scala_proto_show_generator_exception() {
--extra_toolchains=//test/proto/custom_generator:failing_scala_proto_toolchain
}

export USE_BAZEL_VERSION=${USE_BAZEL_VERSION:-$(cat ../../../.bazelversion)}
export USE_BAZEL_VERSION=${USE_BAZEL_VERSION:-$(cat $dir/../../.bazelversion)}
$runner test_scala_proto_library_action_label
$runner test_scala_proto_custom_generator
$runner test_scala_proto_show_generator_exception
5 changes: 2 additions & 3 deletions test_cross_build/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# Remove upon completing Bzlmod compatibility work.
# - https://github.com/bazelbuild/rules_scala/issues/1482
build --noenable_bzlmod
# Remove after moving to Bazel 7.
import ../.bazelrc
3 changes: 0 additions & 3 deletions test_version/.bazelrc
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test_version/.bazelversion
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions third_party/test/example_external_workspace/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# Remove upon completing Bzlmod compatibility work.
# - https://github.com/bazelbuild/rules_scala/issues/1482
build --noenable_bzlmod
import ../../../.bazelrc
4 changes: 1 addition & 3 deletions third_party/test/proto/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# Remove upon completing Bzlmod compatibility work.
# - https://github.com/bazelbuild/rules_scala/issues/1482
build --noenable_bzlmod
import ../../../.bazelrc