Skip to content

Commit 3ac8108

Browse files
committed
Address review.
1 parent d84e745 commit 3ac8108

File tree

6 files changed

+13
-23
lines changed

6 files changed

+13
-23
lines changed

.github/workflows/buildifier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ jobs:
2424
extra_args: >
2525
buildifier --all-files 2>&1 ||
2626
(
27-
echo -e "In order to format all bazel files, please run:\n bazel run //misc/bazel:buildifier"; exit 1
27+
echo -e "In order to format all bazel files, please run:\n bazel run //misc/bazel/buildifier"; exit 1
2828
)

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ repos:
2626
name: Format bazel files
2727
files: \.(bazel|bzl)
2828
language: system
29-
entry: bazel run //misc/bazel:buildifier
29+
entry: bazel run //misc/bazel/buildifier
3030
pass_filenames: false
3131

3232
# DISABLED: can be enabled by copying this config and installing `pre-commit` with `--config` on the copy

misc/bazel/BUILD.bazel

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
load("@buildifier_prebuilt//:rules.bzl", "buildifier")
2-
3-
buildifier(
4-
name = "buildifier",
5-
exclude_patterns = [
6-
"./.git/*",
7-
],
8-
lint_mode = "fix",
9-
)
10-
111
sh_library(
122
name = "sh_runfiles",
133
srcs = ["runfiles.sh"],

misc/bazel/buildifier/BUILD.bazel

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
load("@buildifier_prebuilt//:rules.bzl", "buildifier")
2+
3+
buildifier(
4+
name = "buildifier",
5+
exclude_patterns = [
6+
"./.git/*",
7+
],
8+
lint_mode = "fix",
9+
)

misc/ripunzip/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ sh_binary(
99
srcs = ["install.sh"],
1010
args = ["$(rlocationpath :ripunzip)"],
1111
data = [":ripunzip"],
12-
deps = ["@bazel_tools//tools/bash/runfiles"],
12+
deps = ["//misc/bazel:sh_runfiles"],
1313
)

misc/ripunzip/install.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,7 @@
22

33
set -eu
44

5-
# --- begin runfiles.bash initialization v3 ---
6-
# Copy-pasted from the Bazel Bash runfiles library v3.
7-
set -uo pipefail; set +e; f=bazel_tools/tools/bash/runfiles/runfiles.bash
8-
source "${RUNFILES_DIR:-/dev/null}/$f" 2>/dev/null || \
9-
source "$(grep -sm1 "^$f " "${RUNFILES_MANIFEST_FILE:-/dev/null}" | cut -f2- -d' ')" 2>/dev/null || \
10-
source "$0.runfiles/$f" 2>/dev/null || \
11-
source "$(grep -sm1 "^$f " "$0.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
12-
source "$(grep -sm1 "^$f " "$0.exe.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
13-
{ echo>&2 "ERROR: cannot find $f"; exit 1; }; f=; set -e
14-
# --- end runfiles.bash initialization v3 ---
5+
source misc/bazel/runfiles.sh 2>/dev/null || source external/ql~/misc/bazel/runfiles.sh
156

167
dest="${2:-$HOME/.local/bin}"
178

0 commit comments

Comments
 (0)