Merge pull request #19911 from joshjms/release-3.4-pull-etcd-verify

[release-3.4] Update make verify for prow job

Author: jmhbnz

.github/workflows/static-analysis.yaml

@@ -7,7 +7,6 @@ jobs:
       fail-fast: false
       matrix:
         target:
-        - linux-amd64-fmt
         - linux-amd64-integration-1-cpu
         - linux-amd64-integration-2-cpu
         - linux-amd64-integration-4-cpu
@@ -34,9 +33,6 @@ jobs:
         echo ${GOROOT}
         echo "${TARGET}"
         case "${TARGET}" in
-          linux-amd64-fmt)
-            GOARCH=amd64 PASSES='fmt bom dep' ./test
-            ;;
           linux-amd64-integration-1-cpu)
             make install-gofail
             GOARCH=amd64 CPU=1 RACE='false' FAILPOINTS='true' make test-integration

.github/workflows/tests.yaml

@@ -555,7 +555,55 @@ gofail-disable: install-gofail
 	PASSES="toggle_failpoints" ./test
 
 .PHONY: verify
-verify: verify-go-versions
+verify: verify-go-versions verify-gofmt verify-bom verify-dep verify-shellcheck verify-goword verify-govet verify-revive verify-license-header verify-receiver-name verify-markdown-you verify-markdown-marker
+
+.PHONY: verify-shellcheck
+verify-shellcheck:
+	PASSES="shellcheck" ./test
+
+.PHONY: verify-markdown-you
+verify-markdown-you:
+	PASSES="markdown_you" ./test
+
+.PHONY: verify-markdown-marker
+verify-markdown-marker:
+	PASSES="markdown_marker" ./test
+
+.PHONY: verify-goword
+verify-goword:
+	PASSES="goword" ./test
+
+.PHONY: verify-gofmt
+verify-gofmt:
+	PASSES="gofmt" ./test
+
+.PHONY: verify-govet
+verify-govet:
+	PASSES="govet" ./test
+
+.PHONY: verify-revive
+verify-revive:
+	PASSES="revive" ./test
+
+.PHONY: verify-license-header
+verify-license-header:
+	PASSES="license_header" ./test
+
+.PHONY: verify-receiver-name
+verify-receiver-name:
+	PASSES="receiver_name" ./test
+
+.PHONY: verify-commit-title
+verify-commit-title:
+	PASSES="commit_title" ./test
+
+.PHONY: verify-bom
+verify-bom:
+	PASSES="bom" ./test
+
+.PHONY: verify-dep
+verify-dep:
+	PASSES="dep" ./test
 
 .PHONY: verify-go-versions
 verify-go-versions:

Makefile

@@ -698,30 +698,6 @@ function commit_title_pass {
 	done
 }
 
-# tools gosimple,unused,staticheck,unconvert,ineffasign,nakedret
-# are not module-aware. See https://github.com/golang/go/issues/24661
-# The module-aware versions need to be used when they become available
-function fmt_pass {
-	toggle_failpoints disable
-
-    # TODO: add "unparam"
-	for p in shellcheck \
-			markdown_you \
-			markdown_marker \
-			goword \
-			gofmt \
-			govet \
-			revive \
-			license_header \
-			receiver_name \
-			commit_title \
-			; do
-		echo "'$p' started at $(date)"
-		"${p}"_pass "$@"
-		echo "'$p' completed at $(date)"
-	done
-}
-
 function bom_pass {
 	if ! command -v license-bill-of-materials >/dev/null; then
 		echo "Skipping bom..."