Skip to content

Commit 8bb2dad

Browse files
committed
Cleanup top level interface
1 parent 32f4162 commit 8bb2dad

9 files changed

Lines changed: 34 additions & 30 deletions

File tree

.bazelrc

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1+
###############################################################################
2+
## Bazel Configuration Flags
3+
##
4+
## `.bazelrc` is a Bazel configuration file.
5+
## https://bazel.build/docs/best-practices#bazelrc-file
6+
###############################################################################
7+
18
test --test_output=errors
29

310
# Fix the excessive rebuilding when using anything that depends on protobuf rules
411
# See https://github.com/bazelbuild/buildtools/issues/744
512
common --incompatible_strict_action_env
613
common --enable_bzlmod
714

8-
try-import user.bazelrc
9-
1015
# To update these lines, execute
1116
# `bazel run @rules_bazel_integration_test//tools:update_deleted_packages`
1217
build --deleted_packages=examples/check_glob,examples/optional_attributes
@@ -15,3 +20,26 @@ query --deleted_packages=examples/check_glob,examples/optional_attributes
1520
# Enable the aspect
1621
build --aspects=//shellcheck:shellcheck_aspect.bzl%shellcheck_aspect
1722
build --output_groups=+shellcheck_checks
23+
24+
###############################################################################
25+
## Incompatibility flags
26+
###############################################################################
27+
28+
# https://github.com/bazelbuild/bazel/issues/8195
29+
build --incompatible_disallow_empty_glob=true
30+
31+
# https://github.com/bazelbuild/bazel/issues/12821
32+
build --nolegacy_external_runfiles
33+
34+
# https://github.com/bazelbuild/bazel/issues/23043.
35+
build --incompatible_autoload_externally=
36+
37+
###############################################################################
38+
## Custom user flags
39+
##
40+
## This should always be the last thing in the `.bazelrc` file to ensure
41+
## consistent behavior when setting flags in that file as `.bazelrc` files are
42+
## evaluated top to bottom.
43+
###############################################################################
44+
45+
try-import user.bazelrc

BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ filegroup(
22
name = "distribution",
33
srcs = [
44
"BUILD.bazel",
5-
"def.bzl",
6-
"deps.bzl",
75
"CHANGELOG.md",
86
"LICENSE",
97
"MODULE.bazel",

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bazel run @rules_shellcheck//:shellcheck -- <parameters>
1515
And you can define a lint target:
1616

1717
```starlark
18-
load("@rules_shellcheck//:def.bzl", "shellcheck", "shellcheck_test")
18+
load("@rules_shellcheck//shellcheck:shellcheck_test.bzl", "shellcheck_test")
1919

2020
shellcheck_test(
2121
name = "shellcheck_test",

WORKSPACE

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
workspace(name = "rules_shellcheck")
2-
3-
load("//:deps.bzl", "shellcheck_dependencies")
4-
5-
shellcheck_dependencies()

def.bzl

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

deps.bzl

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

examples/check_glob/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@rules_shellcheck//:def.bzl", "shellcheck_test")
1+
load("@rules_shellcheck//shellcheck:shellcheck_test.bzl", "shellcheck_test")
22

33
shellcheck_test(
44
name = "shellcheck_all",

examples/optional_attributes/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@rules_shellcheck//:def.bzl", "shellcheck_test")
1+
load("@rules_shellcheck//shellcheck:shellcheck_test.bzl", "shellcheck_test")
22

33
shellcheck_test(
44
name = "shellcheck_all",

internal/pkg/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
22
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
33
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
4-
load("//:def.bzl", "shellcheck_test")
4+
load("//shellcheck:shellcheck_test.bzl", "shellcheck_test")
55

66
pkg_files(
77
name = "files",

0 commit comments

Comments
 (0)