Skip to content

Commit d744b21

Browse files
author
Alex Denisov
committed
Misc: add bazel buildifer pre-commit hook
1 parent 4e4c5f8 commit d744b21

File tree

6 files changed

+61
-31
lines changed

6 files changed

+61
-31
lines changed

.pre-commit-config.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ repos:
2121
- id: autopep8
2222
files: ^misc/codegen/.*\.py
2323

24+
- repo: https://github.com/warchant/pre-commit-buildifier
25+
rev: 0.0.2
26+
hooks:
27+
- id: buildifier
28+
2429
- repo: local
2530
hooks:
2631
- id: codeql-format

misc/bazel/workspace_deps.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
44

55
def codeql_workspace_deps(repository_name = "codeql"):
66
pip_install(
7-
name = "codegen_deps",
8-
requirements = "@%s//misc/codegen:requirements.txt" % repository_name,
7+
name = "codegen_deps",
8+
requirements = "@%s//misc/codegen:requirements.txt" % repository_name,
99
)
1010
bazel_skylib_workspace()
1111
rules_pkg_dependencies()

swift/codegen/BUILD.bazel

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
22

33
native_binary(
44
name = "codegen",
5-
out = "codegen",
65
src = "//misc/codegen",
7-
data = [
8-
"//swift:schema",
9-
"//swift:codegen_conf",
10-
],
6+
out = "codegen",
117
args = [
128
"--configuration-file=$(location //swift:codegen_conf)",
139
],
10+
data = [
11+
"//swift:codegen_conf",
12+
"//swift:schema",
13+
],
1414
visibility = ["//swift:__subpackages__"],
1515
)

swift/third_party/BUILD.binlog.bazel

+19-11
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
11
cc_library(
2-
name = "binlog",
3-
hdrs = glob(["include/**/*.hpp"]),
4-
srcs = glob(["include/**/*.cpp"]),
5-
includes = ["include"],
6-
visibility = ["//visibility:public"],
2+
name = "binlog",
3+
srcs = glob(["include/**/*.cpp"]),
4+
hdrs = glob(["include/**/*.hpp"]),
5+
includes = ["include"],
6+
visibility = ["//visibility:public"],
77
)
88

99
cc_binary(
10-
name = "bread",
11-
srcs = ["bin/bread.cpp", "bin/printers.hpp", "bin/printers.cpp", "bin/getopt.hpp"],
12-
deps = [":binlog"],
10+
name = "bread",
11+
srcs = [
12+
"bin/bread.cpp",
13+
"bin/getopt.hpp",
14+
"bin/printers.cpp",
15+
"bin/printers.hpp",
16+
],
17+
deps = [":binlog"],
1318
)
1419

1520
cc_binary(
16-
name = "brecovery",
17-
srcs = ["bin/brecovery.cpp", "bin/getopt.hpp"],
18-
deps = [":binlog"],
21+
name = "brecovery",
22+
srcs = [
23+
"bin/brecovery.cpp",
24+
"bin/getopt.hpp",
25+
],
26+
deps = [":binlog"],
1927
)

swift/third_party/BUILD.swift-llvm-support.bazel

+13-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,19 @@ load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
22

33
cc_library(
44
name = "swift-llvm-support",
5-
srcs = glob(["*.a", "*.so", "*.dylib"]),
6-
hdrs = glob(["include/**/*", "stdlib/**/*" ]),
5+
srcs = glob([
6+
"*.a",
7+
"*.so",
8+
"*.dylib",
9+
]),
10+
hdrs = glob([
11+
"include/**/*",
12+
"stdlib/**/*",
13+
]),
14+
includes = [
15+
"include",
16+
"stdlib/public/SwiftShims",
17+
],
718
linkopts = [
819
"-lm",
920
"-lz",
@@ -19,7 +30,6 @@ cc_library(
1930
],
2031
"//conditions:default": [],
2132
}),
22-
includes = ["include", "stdlib/public/SwiftShims"],
2333
visibility = ["//visibility:public"],
2434
)
2535

+17-10
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
[
22
py_test(
3-
name = test_dir + '-test',
3+
name = test_dir + "-test",
44
size = "small",
5-
srcs = ['autobuild_tester.py'],
6-
main = 'autobuild_tester.py',
5+
srcs = ["autobuild_tester.py"],
6+
args = [
7+
"$(location //swift/xcode-autobuilder)",
8+
"$(location %s)" % test_dir,
9+
],
710
data = [
811
"//swift/xcode-autobuilder",
912
test_dir,
10-
] + glob([test_dir + '/**/*']),
11-
args = [
12-
'$(location //swift/xcode-autobuilder)',
13-
'$(location %s)' % test_dir,
14-
]
13+
] + glob([test_dir + "/**/*"]),
14+
main = "autobuild_tester.py",
15+
)
16+
for test_dir in glob(
17+
["*"],
18+
exclude = [
19+
"*.*",
20+
".*",
21+
],
22+
exclude_directories = 0,
1523
)
16-
for test_dir in glob(["*"], exclude_directories=0, exclude=['*.*', '.*'])
1724
]
1825

1926
test_suite(
20-
name='tests'
27+
name = "tests",
2128
)

0 commit comments

Comments
 (0)