Merge pull request #10357 from naveenvenk17/fix-bazel-lint-without-git

Fix lint source discovery without git

Author: maliberty

BUILD.bazel

@@ -584,10 +584,14 @@ sh_test(
 sh_binary(
     name = "tidy_tcl",
     srcs = ["//bazel:tcl_tidy.sh"],
-    args = ["$(rootpath //bazel:tclfmt)"],
+    args = [
+        "$(rootpath //bazel:tclfmt)",
+        "$(rootpath @git)",
+    ],
     data = [
         "tclint.toml",
         "//bazel:tclfmt",
+        "@git",
     ],
 )
 
@@ -633,9 +637,13 @@ sh_test(
 sh_binary(
     name = "tidy_bzl",
     srcs = ["//bazel:bzl_tidy.sh"],
-    args = ["$(rootpath @buildifier_prebuilt//:buildifier)"],
+    args = [
+        "$(rootpath @buildifier_prebuilt//:buildifier)",
+        "$(rootpath @git)",
+    ],
     data = [
         "@buildifier_prebuilt//:buildifier",
+        "@git",
     ],
 )
 

bazel/bzl_tidy.sh

@@ -5,12 +5,13 @@
 # Auto-format all Bazel files in-place using buildifier.
 set -euo pipefail
 TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+GIT="$(realpath "$2")"
 cd "${BUILD_WORKSPACE_DIRECTORY:-$PWD}"
 # `-c submodule.recurse=false` keeps git ls-files from descending into
 # submodules (src/sta, third-party/abc, third-party/slang-elab and the
 # fmt sub-submodule nested in it) — we never want to rewrite files
 # owned by another repo. The override is needed because CI sets
 # submodule.recurse=true globally.
-git -c submodule.recurse=false ls-files \
+"${GIT}" -c submodule.recurse=false ls-files \
         '*.bazel' '*.bzl' '**/BUILD' 'BUILD' '**/WORKSPACE' 'WORKSPACE' -z \
     | xargs -0 "$TOOL" -mode=fix -lint=fix

bazel/fix_lint.sh

@@ -17,13 +17,12 @@ BZL_LINT_BUILDIFIER="$8"
 GIT="$9"
 
 export BUILD_WORKSPACE_DIRECTORY="${BUILD_WORKSPACE_DIRECTORY:-$PWD}"
-
 # TCL: auto-format then lint
-"${TCL_TIDY_SH}" "${TCLFMT}"
+"${TCL_TIDY_SH}" "${TCLFMT}" "${GIT}"
 "${TCL_LINT_SH}" "${TCLINT}" "${GIT}" || rc=$?
 
 # Bazel: auto-format then lint
-"${BZL_TIDY_SH}" "${BZL_FMT_BUILDIFIER}"
+"${BZL_TIDY_SH}" "${BZL_FMT_BUILDIFIER}" "${GIT}"
 "${BZL_LINT_SH}" "${BZL_LINT_BUILDIFIER}" "${GIT}" || rc=$?
 
 "${GIT}" -C "$BUILD_WORKSPACE_DIRECTORY" status

bazel/tcl_lint_test.sh

@@ -6,7 +6,7 @@
 
 set -euo pipefail
 
-TOOL="$(realpath "$1")"
+TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
 GIT="$(realpath "$2")"
 
 WORKSPACE="$(dirname "$(readlink -f tclint.toml)")"

bazel/tcl_tidy.sh

@@ -5,5 +5,6 @@
 # Auto-format all TCL files in-place.
 set -euo pipefail
 TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+GIT="$(realpath "$2")"
 cd "${BUILD_WORKSPACE_DIRECTORY:-$PWD}"
-git ls-files '*.tcl' -z | xargs -0 "$TOOL" --in-place
+"${GIT}" ls-files '*.tcl' -z | xargs -0 "$TOOL" --in-place