From d33f68d94a9d74cc8f8ed6ad8a882a736b80b6af Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Fri, 28 Feb 2025 11:26:54 -0800 Subject: [PATCH 1/4] Delete .travis.yml file TravisCI is no longer running for this repository. Prepare to move it to a Prow job. Signed-off-by: Ivan Valdes --- .travis.yml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 3490afc..0000000 --- a/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -language: go -go_import_path: go.etcd.io/protodoc - -sudo: false - -go: -- 1.11 - -script: -- ./test From 9abef7520cc549234045658d8d1335ec7573c321 Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Fri, 28 Feb 2025 11:28:12 -0800 Subject: [PATCH 2/4] Add a Makefile as interface to run tests Signed-off-by: Ivan Valdes --- Makefile | 5 +++++ test => scripts/test.sh | 0 2 files changed, 5 insertions(+) create mode 100644 Makefile rename test => scripts/test.sh (100%) diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..cf044a7 --- /dev/null +++ b/Makefile @@ -0,0 +1,5 @@ +default: test + +.PHONY: test +test: + ./scripts/test.sh diff --git a/test b/scripts/test.sh similarity index 100% rename from test rename to scripts/test.sh From 2a9574d4ff3275e0aaf7b6179541da8a40b7e8c7 Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Fri, 28 Feb 2025 11:36:38 -0800 Subject: [PATCH 3/4] Format test.sh * Remove semicolons * Remove unnecessary variables * Use snake_case for variable names * Replace tabs with spaces Signed-off-by: Ivan Valdes --- scripts/test.sh | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index 4357e0f..1037381 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -1,25 +1,23 @@ #!/usr/bin/env bash -TEST=./...; FMT="*.go" -echo "Running tests..."; -go test -v -cover -cpu 1,2,4 $TEST; -go test -v -cover -cpu 1,2,4 -race $TEST; +echo "Running tests..." +go test -v -cover -cpu 1,2,4 ./... +go test -v -cover -cpu 1,2,4 -race ./... echo "Checking gofmt..." -fmtRes=$(gofmt -l -s $FMT) -if [ -n "${fmtRes}" ]; then - echo -e "gofmt checking failed:\n${fmtRes}" - exit 255 +fmt_res=$(gofmt -l -s $FMT) +if [ -n "${fmt_res}" ]; then + echo -e "gofmt checking failed:\n${fmt_res}" + exit 1 fi echo "Checking govet..." -vetRes=$(go vet $TEST) -if [ -n "${vetRes}" ]; then - echo -e "govet checking failed:\n${vetRes}" - exit 255 +vet_res=$(go vet ./...) +if [ -n "${vet_res}" ]; then + echo -e "govet checking failed:\n${vet_res}" + exit 1 fi -echo "Success"; - +echo "Success" From 19646e4e9b1c6b4311f8c50157ba3b32e723ea6b Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Fri, 28 Feb 2025 11:38:54 -0800 Subject: [PATCH 4/4] Ensure all files are covered by go fmt The current approach was only running go fmt on the top-level *.go files. Signed-off-by: Ivan Valdes --- scripts/test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index 1037381..ccc0ab3 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash -FMT="*.go" - echo "Running tests..." go test -v -cover -cpu 1,2,4 ./... go test -v -cover -cpu 1,2,4 -race ./... echo "Checking gofmt..." -fmt_res=$(gofmt -l -s $FMT) +# We utilize 'go fmt' to find all files suitable for formatting, +# but reuse full power gofmt to perform just RO check. +fmt_res=$(go fmt -n ./... | sed 's| -w | -d |g' | sh) if [ -n "${fmt_res}" ]; then echo -e "gofmt checking failed:\n${fmt_res}" exit 1