From 0cc7402d91aec55855c46ba3aba4c26dd024ad3c Mon Sep 17 00:00:00 2001 From: Victor Payno Date: Sat, 9 Sep 2023 19:57:16 -0700 Subject: [PATCH] ci(go): add show_tool_versions_go_short() to wrapper scripts --- .github/citools/go/go-fixer-go_fix | 2 +- .github/citools/go/go-lint-errcheck | 2 +- .github/citools/go/go-lint-go-consistent | 2 +- .github/citools/go/go-lint-go_vet | 2 +- .github/citools/go/go-lint-gocritic | 2 +- .github/citools/go/go-lint-gocyclo | 2 +- .github/citools/go/go-lint-golangci-lint | 2 +- .github/citools/go/go-lint-gosec | 2 +- .github/citools/go/go-lint-ineffassign | 2 +- .github/citools/go/go-lint-misspell | 2 +- .github/citools/go/go-lint-revive | 2 +- .github/citools/go/go-test-cover | 2 +- .github/citools/go/go-test-cover-report | 2 +- .github/citools/includes/wrapper-library | 11 ++++++++++- 14 files changed, 23 insertions(+), 14 deletions(-) diff --git a/.github/citools/go/go-fixer-go_fix b/.github/citools/go/go-fixer-go_fix index 97798da4..f37b0658 100755 --- a/.github/citools/go/go-fixer-go_fix +++ b/.github/citools/go/go-fixer-go_fix @@ -17,7 +17,7 @@ fi main() { printf "\nRunning go fix\n\n" - show_tool_versions_go + show_tool_versions_go_short print_ruler diff --git a/.github/citools/go/go-lint-errcheck b/.github/citools/go/go-lint-errcheck index 112e257f..7a23cccb 100755 --- a/.github/citools/go/go-lint-errcheck +++ b/.github/citools/go/go-lint-errcheck @@ -11,7 +11,7 @@ declare -i retval=0 main() { printf "\nRunning Go errcheck\n\n" - show_tool_versions_go + show_tool_versions_go_short print_ruler diff --git a/.github/citools/go/go-lint-go-consistent b/.github/citools/go/go-lint-go-consistent index febf1ab2..37bd830e 100755 --- a/.github/citools/go/go-lint-go-consistent +++ b/.github/citools/go/go-lint-go-consistent @@ -17,7 +17,7 @@ fi main() { printf "\nRunning Go go-consistent\n\n" - show_tool_versions_go + show_tool_versions_go_short print_ruler diff --git a/.github/citools/go/go-lint-go_vet b/.github/citools/go/go-lint-go_vet index 1f5c74f0..1187808c 100755 --- a/.github/citools/go/go-lint-go_vet +++ b/.github/citools/go/go-lint-go_vet @@ -17,7 +17,7 @@ fi main() { printf "\nRunning Go Vet\n\n" - show_tool_versions_go + show_tool_versions_go_short print_ruler diff --git a/.github/citools/go/go-lint-gocritic b/.github/citools/go/go-lint-gocritic index 74743512..d581c31a 100755 --- a/.github/citools/go/go-lint-gocritic +++ b/.github/citools/go/go-lint-gocritic @@ -19,7 +19,7 @@ fi main() { printf "\nRunning Go gocritic\n\n" - show_tool_versions_go + show_tool_versions_go_short print_ruler diff --git a/.github/citools/go/go-lint-gocyclo b/.github/citools/go/go-lint-gocyclo index 2443efe8..1db1fe12 100755 --- a/.github/citools/go/go-lint-gocyclo +++ b/.github/citools/go/go-lint-gocyclo @@ -19,7 +19,7 @@ fi main() { printf "\nRunning Go gocyclo\n\n" - show_tool_versions_go + show_tool_versions_go_short print_ruler diff --git a/.github/citools/go/go-lint-golangci-lint b/.github/citools/go/go-lint-golangci-lint index 451867f7..5edce7f0 100755 --- a/.github/citools/go/go-lint-golangci-lint +++ b/.github/citools/go/go-lint-golangci-lint @@ -19,7 +19,7 @@ fi main() { printf "\nRunning GoLangCi-Lint\n\n" - show_tool_versions_go + show_tool_versions_go_short print_ruler diff --git a/.github/citools/go/go-lint-gosec b/.github/citools/go/go-lint-gosec index 3d5dcabd..33ad8724 100755 --- a/.github/citools/go/go-lint-gosec +++ b/.github/citools/go/go-lint-gosec @@ -19,7 +19,7 @@ fi main() { printf "\nRunning Go GoSec\n\n" - show_tool_versions_go + show_tool_versions_go_short print_ruler diff --git a/.github/citools/go/go-lint-ineffassign b/.github/citools/go/go-lint-ineffassign index 3288ddad..fa5387b1 100755 --- a/.github/citools/go/go-lint-ineffassign +++ b/.github/citools/go/go-lint-ineffassign @@ -19,7 +19,7 @@ fi main() { printf "\nRunning Go ineffassign\n\n" - show_tool_versions_go + show_tool_versions_go_short print_ruler diff --git a/.github/citools/go/go-lint-misspell b/.github/citools/go/go-lint-misspell index a7952864..7dd8c40c 100755 --- a/.github/citools/go/go-lint-misspell +++ b/.github/citools/go/go-lint-misspell @@ -19,7 +19,7 @@ fi main() { printf "\nRunning Go misspell\n\n" - show_tool_versions_go + show_tool_versions_go_short print_ruler diff --git a/.github/citools/go/go-lint-revive b/.github/citools/go/go-lint-revive index b105a8dc..2c2524dc 100755 --- a/.github/citools/go/go-lint-revive +++ b/.github/citools/go/go-lint-revive @@ -19,7 +19,7 @@ fi main() { printf "\nRunning Go Lint Revive\n\n" - show_tool_versions_go + show_tool_versions_go_short print_ruler diff --git a/.github/citools/go/go-test-cover b/.github/citools/go/go-test-cover index 00ac07a2..3df42c3b 100755 --- a/.github/citools/go/go-test-cover +++ b/.github/citools/go/go-test-cover @@ -11,7 +11,7 @@ declare -i retval=0 main() { printf "\nRunning Go Test & Coverage\n\n" - show_tool_versions_go + show_tool_versions_go_short print_ruler diff --git a/.github/citools/go/go-test-cover-report b/.github/citools/go/go-test-cover-report index c92ea33e..be32a748 100755 --- a/.github/citools/go/go-test-cover-report +++ b/.github/citools/go/go-test-cover-report @@ -20,7 +20,7 @@ cover_annotate() { main() { printf "\nRunning Go Test, Coverage & Reports\n\n" - show_tool_versions_go + show_tool_versions_go_short print_ruler diff --git a/.github/citools/includes/wrapper-library b/.github/citools/includes/wrapper-library index 3b03d79f..c16f8ca3 100644 --- a/.github/citools/includes/wrapper-library +++ b/.github/citools/includes/wrapper-library @@ -77,6 +77,15 @@ show_tool_versions_rust() { printf "\n" } # show_tool_versions_rust() +show_tool_versions_go_short() { + # md_code_tag text + printf "Go version:\n" + printf "\n" + go version | paste /dev/null - + # md_code_tag + printf "\n" +} # show_tool_versions_go_short() + show_tool_versions_go() { # md_code_tag text printf "Go version:\n" @@ -93,7 +102,7 @@ show_tool_versions_go() { printf "Installed Go packages:\n" printf "\n" # shellcheck disable=SC2012 - ls ~/go/bin | paste /dev/null - + ls /root/go/bin | paste /dev/null - # md_code_tag printf "\n"