From 0ece40453a074273f9f5300048b579b75f0d2ae8 Mon Sep 17 00:00:00 2001 From: Wei Fu Date: Sat, 30 Sep 2023 17:35:14 +0800 Subject: [PATCH 1/2] .github: ensure there is no change after make-fix Signed-off-by: Wei Fu --- .github/workflows/static-analysis.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 627015585..a7ee8d6aa 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.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 From ddc2b56af394b19663ffc6bb677dc1d0cf0da325 Mon Sep 17 00:00:00 2001 From: Wei Fu Date: Sat, 30 Sep 2023 17:52:57 +0800 Subject: [PATCH 2/2] tools: fix yamlfmt issue Signed-off-by: Wei Fu --- tools/.golangci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/.golangci.yaml b/tools/.golangci.yaml index e82199541..c917b536e 100644 --- a/tools/.golangci.yaml +++ b/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.