Give it a bif of puku magic

thought-machine · Nov 15, 2023 · 14c8b37 · 14c8b37
1 parent 2411115
commit 14c8b37
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 10 deletions.
diff --git a/src/build/BUILD b/src/build/BUILD
@@ -43,13 +43,10 @@ go_test(
     srcs = ["build_step_stress_test.go"],
     external = True,
     deps = [
-        ":build",
         "///third_party/go/github.com_stretchr_testify//assert",
-        "///third_party/go/github.com_stretchr_testify//require",
         "//src/cli/logging",
         "//src/core",
         "//src/fs",
-        "//src/output",
         "//src/plz",
     ],
 )
diff --git a/src/cli/BUILD b/src/cli/BUILD
@@ -9,6 +9,7 @@ go_library(
         "replacements.go",
         "suggest.go",
         "winch_other.go",
+        "winch_windows.go",
         "window.go",
     ],
     pgo_file = "//:pgo",

diff --git a/src/cmap/BUILD b/src/cmap/BUILD
@@ -38,6 +38,6 @@ go_benchmark(
     srcs = ["hash_test.go"],
     deps = [
         ":cmap",
-        "///third_party/go/github.com_stretchr_testify//assert",
+        "///third_party/go/github.com_cespare_xxhash_v2//:v2",
     ],
 )
diff --git a/src/core/BUILD b/src/core/BUILD
@@ -9,6 +9,7 @@ go_library(
     pgo_file = "//:pgo",
     visibility = ["PUBLIC"],
     deps = [
+        "///third_party/go/github.com_bazelbuild_remote-apis//build/bazel/remote/execution/v2",
         "///third_party/go/github.com_cespare_xxhash_v2//:v2",
         "///third_party/go/github.com_coreos_go-semver//semver",
         "///third_party/go/github.com_google_shlex//:shlex",
@@ -21,6 +22,7 @@ go_library(
         "///third_party/go/github.com_thought-machine_go-flags//:go-flags",
         "///third_party/go/github.com_zeebo_blake3//:blake3",
         "///third_party/go/golang.org_x_sync//errgroup",
+        "///third_party/go/google.golang.org_protobuf//proto",
         "//src/cli",
         "//src/cli/logging",
         "//src/cmap",
@@ -41,6 +43,7 @@ go_test(
         "///third_party/go/github.com_stretchr_testify//require",
         "///third_party/go/github.com_thought-machine_go-flags//:go-flags",
         "//src/cli",
+        "//src/fs",
     ],
 )
 

diff --git a/src/fs/BUILD b/src/fs/BUILD
@@ -50,6 +50,7 @@ go_test(
     srcs = ["glob_integration_test.go"],
     # This must remain a glob because the tests rely on data being loaded in via globs
     data = glob(["test_data/**"]),
+    deps = [":fs"],
 )
 
 go_benchmark(

diff --git a/src/parse/asp/BUILD b/src/parse/asp/BUILD
@@ -24,7 +24,6 @@ go_library(
         "///third_party/go/github.com_manifoldco_promptui//:promptui",
         "///third_party/go/github.com_please-build_gcfg//types",
         "///third_party/go/golang.org_x_exp//slices",
-        "//rules",
         "//src/cli",
         "//src/cli/logging",
         "//src/cmap",

diff --git a/src/remote/BUILD b/src/remote/BUILD
@@ -33,7 +33,6 @@ go_library(
         "///third_party/go/google.golang.org_protobuf//proto",
         "///third_party/go/google.golang.org_protobuf//types/known/durationpb",
         "//src/build",
-        "//src/cache",
         "//src/cli/logging",
         "//src/core",
         "//src/fs",
@@ -69,6 +68,7 @@ go_test(
         "///third_party/go/google.golang.org_protobuf//reflect/protoreflect",
         "///third_party/go/google.golang.org_protobuf//types/known/anypb",
         "///third_party/go/google.golang.org_protobuf//types/known/timestamppb",
+        "//src/cache",
         "//src/core",
         "//src/fs",
     ],

diff --git a/src/test/BUILD b/src/test/BUILD
@@ -50,9 +50,7 @@ go_test(
     name = "go_test_panic",
     srcs = ["go_test_panic.go"],
     labels = ["manual"],
-    deps = [
-        "///third_party/go/github.com_stretchr_testify//assert",
-    ],
+    deps = [":test"],
 )
 
 # This test runs the test above (go_test_panic), which panics, and checks that

diff --git a/src/tool/BUILD b/src/tool/BUILD
@@ -18,5 +18,6 @@ go_test(
         ":tool",
         "///third_party/go/github.com_stretchr_testify//assert",
         "//src/core",
+        "//src/fs",
     ],
 )
diff --git a/src/update/test/BUILD b/src/update/test/BUILD
@@ -6,5 +6,4 @@ go_binary(
     definitions = {"main.pleaseVersion": VERSION},
     test_only = True,
     visibility = ["//src/update:all"],
-    deps = ["//src/core"],
 )
diff --git a/test/entry_point/test_repo/tools/puku.json b/test/entry_point/test_repo/tools/puku.json
@@ -0,0 +1,3 @@
+{
+  "stop": true
+}
diff --git a/test/plz_exec/test_repo/puku.json b/test/plz_exec/test_repo/puku.json
@@ -0,0 +1,3 @@
+{
+  "stop": true
+}
diff --git a/test/proto_plugin/test_repo/test/puku.json b/test/proto_plugin/test_repo/test/puku.json
@@ -0,0 +1,3 @@
+{
+  "stop": true
+}
diff --git a/tools/build_langserver/lsp/BUILD b/tools/build_langserver/lsp/BUILD
@@ -34,6 +34,7 @@ go_test(
     data = ["test_data"],
     deps = [
         ":lsp",
+        "///third_party/go/github.com_bazelbuild_buildtools//build",
         "///third_party/go/github.com_sourcegraph_go-lsp//:go-lsp",
         "///third_party/go/github.com_sourcegraph_jsonrpc2//:jsonrpc2",
         "///third_party/go/github.com_stretchr_testify//assert",

diff --git a/tools/build_langserver/lsp/test_data/src/core/puku.json b/tools/build_langserver/lsp/test_data/src/core/puku.json
@@ -0,0 +1,3 @@
+{
+  "stop": true
+}