Revert "buildifier: decouple runner scripts from binaries (#1398)" (#1413)
This reverts commit 9a9819efe30f571dda70302ebe7acca5d4f63bdf.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 77bd379..d92f478 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -23,4 +23,4 @@
- "//:tests"
- "-//warn/docs:docs_test"
- "-//build:build_test"
- - "-//buildifier/cmd:buildifier_integration_test"
+ - "-//buildifier:buildifier_integration_test"
diff --git a/BUILD.bazel b/BUILD.bazel
index 80bb532..bc2fc5a 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -23,7 +23,7 @@
"//api_proto:api.gen.pb.go_checkshtest",
"//build:build_test",
"//build_proto:build.gen.pb.go_checkshtest",
- "//buildifier/cmd:buildifier_integration_test",
+ "//buildifier:buildifier_integration_test",
"//deps_proto:deps.gen.pb.go_checkshtest",
"//edit:edit_test",
"//extra_actions_base_proto:extra_actions_base.gen.pb.go_checkshtest",
diff --git a/buildifier/BUILD.bazel b/buildifier/BUILD.bazel
index 3a282f2..5bf6338 100644
--- a/buildifier/BUILD.bazel
+++ b/buildifier/BUILD.bazel
@@ -1,19 +1,123 @@
-# Keep earlier public labels working by pointing to the new `cmd` subpackage
-[alias(
- name = name,
- actual = "//buildifier/cmd:{}".format(name),
+load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
+
+go_binary(
+ name = "buildifier",
+ embed = [":buildifier_lib"],
visibility = ["//visibility:public"],
-) for name in (
- "buildifier",
- "buildifier-darwin-amd64",
- "buildifier-darwin-arm64",
- "buildifier-linux-amd64",
- "buildifier-linux-arm64",
- "buildifier-linux-riscv64",
- "buildifier-linux-s390x",
- "buildifier-windows-amd64",
- "buildifier-windows-arm64",
-)]
+)
+
+go_binary(
+ name = "buildifier-darwin-amd64",
+ out = "buildifier-darwin_amd64",
+ embed = [":buildifier_lib"],
+ goarch = "amd64",
+ goos = "darwin",
+ pure = "on",
+ visibility = ["//visibility:public"],
+)
+
+go_binary(
+ name = "buildifier-linux-amd64",
+ out = "buildifier-linux_amd64",
+ embed = [":buildifier_lib"],
+ goarch = "amd64",
+ goos = "linux",
+ pure = "on",
+ visibility = ["//visibility:public"],
+)
+
+go_binary(
+ name = "buildifier-windows-amd64",
+ out = "buildifier-windows_amd64.exe",
+ embed = [":buildifier_lib"],
+ goarch = "amd64",
+ goos = "windows",
+ pure = "on",
+ visibility = ["//visibility:public"],
+)
+
+go_binary(
+ name = "buildifier-darwin-arm64",
+ out = "buildifier-darwin_arm64",
+ embed = [":buildifier_lib"],
+ goarch = "arm64",
+ goos = "darwin",
+ pure = "on",
+ visibility = ["//visibility:public"],
+)
+
+go_binary(
+ name = "buildifier-linux-arm64",
+ out = "buildifier-linux_arm64",
+ embed = [":buildifier_lib"],
+ goarch = "arm64",
+ goos = "linux",
+ pure = "on",
+ visibility = ["//visibility:public"],
+)
+
+go_binary(
+ name = "buildifier-windows-arm64",
+ out = "buildifier-windows_arm64.exe",
+ embed = [":buildifier_lib"],
+ goarch = "arm64",
+ goos = "windows",
+ pure = "on",
+ visibility = ["//visibility:public"],
+)
+
+go_binary(
+ name = "buildifier-linux-riscv64",
+ out = "buildifier-linux_riscv64",
+ embed = [":buildifier_lib"],
+ goarch = "riscv64",
+ goos = "linux",
+ pure = "on",
+ visibility = ["//visibility:public"],
+)
+
+go_binary(
+ name = "buildifier-linux-s390x",
+ out = "buildifier-linux_s390x",
+ embed = [":buildifier_lib"],
+ goarch = "s390x",
+ goos = "linux",
+ pure = "on",
+ visibility = ["//visibility:public"],
+)
+
+# Test that the buildifier binary works
+sh_test(
+ name = "buildifier_integration_test",
+ size = "small",
+ srcs = ["integration_test.sh"],
+ args = [
+ "$(location :buildifier)",
+ ],
+ data = [
+ ":buildifier",
+ ],
+ deps = ["@bazel_tools//tools/bash/runfiles"],
+)
+
+go_library(
+ name = "buildifier_lib",
+ srcs = ["buildifier.go"],
+ importpath = "github.com/bazelbuild/buildtools/buildifier",
+ visibility = ["//visibility:private"],
+ x_defs = {
+ "main.buildVersion": "{STABLE_buildVersion}",
+ "main.buildScmRevision": "{STABLE_buildScmRevision}",
+ },
+ deps = [
+ "//build",
+ "//buildifier/config",
+ "//buildifier/utils",
+ "//differ",
+ "//wspace",
+ ],
+)
exports_files(
[
diff --git a/buildifier/cmd/buildifier.go b/buildifier/buildifier.go
similarity index 100%
rename from buildifier/cmd/buildifier.go
rename to buildifier/buildifier.go
diff --git a/buildifier/cmd/BUILD.bazel b/buildifier/cmd/BUILD.bazel
deleted file mode 100644
index 6b303e2..0000000
--- a/buildifier/cmd/BUILD.bazel
+++ /dev/null
@@ -1,120 +0,0 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("@rules_shell//shell:sh_test.bzl", "sh_test")
-
-go_binary(
- name = "buildifier",
- embed = [":buildifier_lib"],
- visibility = ["//visibility:public"],
-)
-
-go_binary(
- name = "buildifier-darwin-amd64",
- out = "buildifier-darwin_amd64",
- embed = [":buildifier_lib"],
- goarch = "amd64",
- goos = "darwin",
- pure = "on",
- visibility = ["//visibility:public"],
-)
-
-go_binary(
- name = "buildifier-linux-amd64",
- out = "buildifier-linux_amd64",
- embed = [":buildifier_lib"],
- goarch = "amd64",
- goos = "linux",
- pure = "on",
- visibility = ["//visibility:public"],
-)
-
-go_binary(
- name = "buildifier-windows-amd64",
- out = "buildifier-windows_amd64.exe",
- embed = [":buildifier_lib"],
- goarch = "amd64",
- goos = "windows",
- pure = "on",
- visibility = ["//visibility:public"],
-)
-
-go_binary(
- name = "buildifier-darwin-arm64",
- out = "buildifier-darwin_arm64",
- embed = [":buildifier_lib"],
- goarch = "arm64",
- goos = "darwin",
- pure = "on",
- visibility = ["//visibility:public"],
-)
-
-go_binary(
- name = "buildifier-linux-arm64",
- out = "buildifier-linux_arm64",
- embed = [":buildifier_lib"],
- goarch = "arm64",
- goos = "linux",
- pure = "on",
- visibility = ["//visibility:public"],
-)
-
-go_binary(
- name = "buildifier-windows-arm64",
- out = "buildifier-windows_arm64.exe",
- embed = [":buildifier_lib"],
- goarch = "arm64",
- goos = "windows",
- pure = "on",
- visibility = ["//visibility:public"],
-)
-
-go_binary(
- name = "buildifier-linux-riscv64",
- out = "buildifier-linux_riscv64",
- embed = [":buildifier_lib"],
- goarch = "riscv64",
- goos = "linux",
- pure = "on",
- visibility = ["//visibility:public"],
-)
-
-go_binary(
- name = "buildifier-linux-s390x",
- out = "buildifier-linux_s390x",
- embed = [":buildifier_lib"],
- goarch = "s390x",
- goos = "linux",
- pure = "on",
- visibility = ["//visibility:public"],
-)
-
-# Test that the buildifier binary works
-sh_test(
- name = "buildifier_integration_test",
- size = "small",
- srcs = ["integration_test.sh"],
- args = [
- "$(location :buildifier)",
- ],
- data = [
- ":buildifier",
- ],
- deps = ["@bazel_tools//tools/bash/runfiles"],
-)
-
-go_library(
- name = "buildifier_lib",
- srcs = ["buildifier.go"],
- importpath = "github.com/bazelbuild/buildtools/buildifier",
- visibility = ["//visibility:private"],
- x_defs = {
- "main.buildVersion": "{STABLE_buildVersion}",
- "main.buildScmRevision": "{STABLE_buildScmRevision}",
- },
- deps = [
- "//build",
- "//buildifier/config",
- "//buildifier/utils",
- "//differ",
- "//wspace",
- ],
-)
diff --git a/buildifier/config/BUILD.bazel b/buildifier/config/BUILD.bazel
index 9254f83..070d756 100644
--- a/buildifier/config/BUILD.bazel
+++ b/buildifier/config/BUILD.bazel
@@ -7,7 +7,7 @@
"validation.go",
],
importpath = "github.com/bazelbuild/buildtools/buildifier/config",
- visibility = ["//buildifier/cmd:__pkg__"],
+ visibility = ["//buildifier:__pkg__"],
deps = [
"//tables",
"//warn",
diff --git a/buildifier/cmd/integration_test.sh b/buildifier/integration_test.sh
similarity index 100%
rename from buildifier/cmd/integration_test.sh
rename to buildifier/integration_test.sh
