Merge pull request #10249 from oharboe/fix-lint

bazel: fix bzl lint tests and surface suppressed external-path warnings

Author: maliberty

BUILD.bazel

@@ -573,6 +573,7 @@ sh_binary(
         "$(rootpath @buildifier_prebuilt//:buildifier)",
     ],
     data = [
+        "MODULE.bazel",
         "tclint.toml",
         "//bazel:bzl_lint_test.sh",
         "//bazel:bzl_tidy.sh",

bazel/bison.bzl

@@ -29,7 +29,7 @@ def correct_bison_env_for_action(env, bison):
 
     bison_env["BISON_PKGDATADIR"] = bison_env["BISON_PKGDATADIR"].replace(
         bison_runfiles_dir,
-        "external/{}".format(bison.owner.workspace_name),
+        "external/{}".format(bison.owner.workspace_name),  # buildifier: disable=external-path
     )
     bison_env["M4"] = bison_env["M4"].replace(
         bison_runfiles_dir,

bazel/bzl_fmt_test.sh

@@ -4,8 +4,12 @@
 #
 # Check that all Bazel files are properly formatted (no lint warnings).
 set -euo pipefail
-TOOL="$(readlink -f "$1")"
-WORKSPACE="$(dirname "$(readlink -f MODULE.bazel)")"
+TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+# MODULE.bazel must be in the sh_test `data` deps so it appears as a
+# runfiles symlink pointing at the real workspace. `readlink` (no -f,
+# for macOS portability) resolves the absolute path Bazel wrote.
+[ -L MODULE.bazel ] || { echo "MODULE.bazel missing from runfiles" >&2; exit 1; }
+WORKSPACE="$(dirname "$(readlink MODULE.bazel)")"
 cd "$WORKSPACE"
 # `git ls-files` skips submodule contents (src/sta, third-party/abc).
 # Explicit -mode=check -lint=off separates format errors from lint warnings,

bazel/bzl_lint_test.sh

@@ -4,8 +4,12 @@
 #
 # Lint all Bazel files using buildifier (check-only, with lint warnings).
 set -euo pipefail
-TOOL="$(readlink -f "$1")"
-WORKSPACE="$(dirname "$(readlink -f MODULE.bazel)")"
+TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+# MODULE.bazel must be in the sh_test `data` deps so it appears as a
+# runfiles symlink pointing at the real workspace. `readlink` (no -f,
+# for macOS portability) resolves the absolute path Bazel wrote.
+[ -L MODULE.bazel ] || { echo "MODULE.bazel missing from runfiles" >&2; exit 1; }
+WORKSPACE="$(dirname "$(readlink MODULE.bazel)")"
 cd "$WORKSPACE"
 # `git ls-files` skips submodule contents (src/sta, third-party/abc), so
 # we never try to reformat files owned by another repo.