Merge pull request #16670 from fuweid/fix-make-fix

.github: ensure there is no change after make-fix

.github/workflows/static-analysis.yaml

@@ -30,3 +30,13 @@ jobs:
           set -euo pipefail
 
           make fix
+
+          DIFF=$(git status --porcelain)
+
+          if [ -n "$DIFF" ]; then
+            echo "These files were modified:"
+            echo
+            echo "$DIFF"
+            echo
+            exit 1
+          fi

tools/.golangci.yaml

@@ -23,7 +23,7 @@ linters:
     - staticcheck
     - stylecheck
     - unused
-    - unconvert  # Remove unnecessary type conversions
+    - unconvert # Remove unnecessary type conversions
 linters-settings: # please keep this alphabetized
   goimports:
     local-prefixes: go.etcd.io # Put imports beginning with prefix after 3rd-party packages.