Replace //linters:gofmt with normal go fmt call

.cc and .h files needed to be moved to not be in the same folder as go files to be compatible with this way of running go fmt Test: Tested that a local unformated file was formatted Bug: N/A Change-Id: Ie5866fc36d804348d128fac38836903e7414d578 GitOrigin-RevId: 1994e2be452b4cc84632aad4fa48a8eac25bd623
bazelbuild · Jun 21, 2024 · 31cac29 · 31cac29
1 parent ba1cdf1
commit 31cac29
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 23 deletions.
diff --git a/examples/proxyclient/BUILD.bazel b/examples/proxyclient/BUILD.bazel
@@ -1,7 +1,5 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
-# gazelle:exclude test.h
-
 go_library(
     name = "proxyclient_lib",
     srcs = ["main.go"],
@@ -16,10 +14,7 @@ go_library(
 
 go_binary(
     name = "proxyclient",
-    data = [
-        "test.cpp",
-        "test.h",
-    ],
+    data = glob(["testdata/**"]),
     embed = [":proxyclient_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/examples/proxyclient/main.go b/examples/proxyclient/main.go
@@ -45,7 +45,7 @@ func main() {
 	res, err := client.RunCommand(ctx, &ppb.RunRequest{
 		Labels: map[string]string{"type": "compile", "lang": "cpp", "compiler": "clang"},
 		Command: &cpb.Command{
-			Args:     []string{"clang", "-c", "-o", "test.o", "examples/proxyclient/test.cpp"},
+			Args:     []string{"clang", "-c", "-o", "test.o", "examples/proxyclient/testdata/test.cpp"},
 			ExecRoot: wd,
 			Platform: map[string]string{
 				"container-image": "docker://gcr.io/foundry-x-experiments/proxy-test@sha256:af0af0a78b2766398b1789c01d1665547b97246b7adc4848df5ebbfa21fab490",

diff --git a/examples/proxyclient/test.cpp → examples/proxyclient/testdata/test.cpp b/examples/proxyclient/test.cpp → examples/proxyclient/testdata/test.cpp
diff --git a/examples/proxyclient/test.h → examples/proxyclient/testdata/test.h b/examples/proxyclient/test.h → examples/proxyclient/testdata/test.h
diff --git a/linters/BUILD.bazel b/linters/BUILD.bazel
@@ -1,18 +1,3 @@
-sh_binary(
-    name = "gofmt",
-    srcs = ["run_in_workspace.sh"],
-    args = [
-        "$(location @go_sdk//:bin/gofmt)",
-    ],
-    data = [
-        "@go_sdk//:bin/gofmt",
-    ],
-    tags = [
-        "local",
-        "manual",
-    ],
-)
-
 sh_binary(
     name = "clang-format",
     srcs = ["run_in_workspace.sh"],

diff --git a/scripts/precommit.sh b/scripts/precommit.sh
@@ -36,7 +36,7 @@ fi
 
 LINTPASS=true
 echo Running gofmt...
-bazelisk run --ui_event_filters=-info,-stderr --noshow_progress //linters:gofmt -- -w .
+bazelisk run --ui_event_filters=-info,-stderr --noshow_progress @io_bazel_rules_go//go -- fmt ./...
 STAGED_CPP_FILES="$(git diff --cached --name-only --diff-filter=d | grep "\.cc$\|\.h$")"
 if [ -n "$STAGED_CPP_FILES" ]; then
   echo Running clang-format...