Skip to content

Commit 8e68360

Browse files
rdesgroppesrdesgroppes
authored
Revert "buildifier: decouple runner scripts from binaries (#1398)" (#1413)
This reverts commit 9a9819e.
1 parent 9a9819e commit 8e68360

7 files changed

Lines changed: 123 additions & 139 deletions

File tree

‎.bazelci/presubmit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ platforms:
2323
- "//:tests"
2424
- "-//warn/docs:docs_test"
2525
- "-//build:build_test"
26-
- "-//buildifier/cmd:buildifier_integration_test"
26+
- "-//buildifier:buildifier_integration_test"

‎BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ test_suite(
2323
"//api_proto:api.gen.pb.go_checkshtest",
2424
"//build:build_test",
2525
"//build_proto:build.gen.pb.go_checkshtest",
26-
"//buildifier/cmd:buildifier_integration_test",
26+
"//buildifier:buildifier_integration_test",
2727
"//deps_proto:deps.gen.pb.go_checkshtest",
2828
"//edit:edit_test",
2929
"//extra_actions_base_proto:extra_actions_base.gen.pb.go_checkshtest",

‎buildifier/BUILD.bazel‎

Lines changed: 120 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,123 @@
1-
# Keep earlier public labels working by pointing to the new `cmd` subpackage
2-
[alias(
3-
name = name,
4-
actual = "//buildifier/cmd:{}".format(name),
5-
visibility = ["//visibility:public"],
6-
) for name in (
7-
"buildifier",
8-
"buildifier-darwin-amd64",
9-
"buildifier-darwin-arm64",
10-
"buildifier-linux-amd64",
11-
"buildifier-linux-arm64",
12-
"buildifier-linux-riscv64",
13-
"buildifier-linux-s390x",
14-
"buildifier-windows-amd64",
15-
"buildifier-windows-arm64",
16-
)]
1+
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
2+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
3+
4+
go_binary(
5+
name = "buildifier",
6+
embed = [":buildifier_lib"],
7+
visibility = ["//visibility:public"],
8+
)
9+
10+
go_binary(
11+
name = "buildifier-darwin-amd64",
12+
out = "buildifier-darwin_amd64",
13+
embed = [":buildifier_lib"],
14+
goarch = "amd64",
15+
goos = "darwin",
16+
pure = "on",
17+
visibility = ["//visibility:public"],
18+
)
19+
20+
go_binary(
21+
name = "buildifier-linux-amd64",
22+
out = "buildifier-linux_amd64",
23+
embed = [":buildifier_lib"],
24+
goarch = "amd64",
25+
goos = "linux",
26+
pure = "on",
27+
visibility = ["//visibility:public"],
28+
)
29+
30+
go_binary(
31+
name = "buildifier-windows-amd64",
32+
out = "buildifier-windows_amd64.exe",
33+
embed = [":buildifier_lib"],
34+
goarch = "amd64",
35+
goos = "windows",
36+
pure = "on",
37+
visibility = ["//visibility:public"],
38+
)
39+
40+
go_binary(
41+
name = "buildifier-darwin-arm64",
42+
out = "buildifier-darwin_arm64",
43+
embed = [":buildifier_lib"],
44+
goarch = "arm64",
45+
goos = "darwin",
46+
pure = "on",
47+
visibility = ["//visibility:public"],
48+
)
49+
50+
go_binary(
51+
name = "buildifier-linux-arm64",
52+
out = "buildifier-linux_arm64",
53+
embed = [":buildifier_lib"],
54+
goarch = "arm64",
55+
goos = "linux",
56+
pure = "on",
57+
visibility = ["//visibility:public"],
58+
)
59+
60+
go_binary(
61+
name = "buildifier-windows-arm64",
62+
out = "buildifier-windows_arm64.exe",
63+
embed = [":buildifier_lib"],
64+
goarch = "arm64",
65+
goos = "windows",
66+
pure = "on",
67+
visibility = ["//visibility:public"],
68+
)
69+
70+
go_binary(
71+
name = "buildifier-linux-riscv64",
72+
out = "buildifier-linux_riscv64",
73+
embed = [":buildifier_lib"],
74+
goarch = "riscv64",
75+
goos = "linux",
76+
pure = "on",
77+
visibility = ["//visibility:public"],
78+
)
79+
80+
go_binary(
81+
name = "buildifier-linux-s390x",
82+
out = "buildifier-linux_s390x",
83+
embed = [":buildifier_lib"],
84+
goarch = "s390x",
85+
goos = "linux",
86+
pure = "on",
87+
visibility = ["//visibility:public"],
88+
)
89+
90+
# Test that the buildifier binary works
91+
sh_test(
92+
name = "buildifier_integration_test",
93+
size = "small",
94+
srcs = ["integration_test.sh"],
95+
args = [
96+
"$(location :buildifier)",
97+
],
98+
data = [
99+
":buildifier",
100+
],
101+
deps = ["@bazel_tools//tools/bash/runfiles"],
102+
)
103+
104+
go_library(
105+
name = "buildifier_lib",
106+
srcs = ["buildifier.go"],
107+
importpath = "github.com/bazelbuild/buildtools/buildifier",
108+
visibility = ["//visibility:private"],
109+
x_defs = {
110+
"main.buildVersion": "{STABLE_buildVersion}",
111+
"main.buildScmRevision": "{STABLE_buildScmRevision}",
112+
},
113+
deps = [
114+
"//build",
115+
"//buildifier/config",
116+
"//buildifier/utils",
117+
"//differ",
118+
"//wspace",
119+
],
120+
)
17121

18122
exports_files(
19123
[

buildifier/cmd/buildifier.go renamed to buildifier/buildifier.go

File renamed without changes.

‎buildifier/cmd/BUILD.bazel‎

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

‎buildifier/config/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ go_library(
77
"validation.go",
88
],
99
importpath = "github.com/bazelbuild/buildtools/buildifier/config",
10-
visibility = ["//buildifier/cmd:__pkg__"],
10+
visibility = ["//buildifier:__pkg__"],
1111
deps = [
1212
"//tables",
1313
"//warn",

buildifier/cmd/integration_test.sh renamed to buildifier/integration_test.sh

File renamed without changes.

0 commit comments

Comments
 (0)