From 38316f28f0bfabcf698e3217236dee1e12d92bc8 Mon Sep 17 00:00:00 2001 From: Chris Suszynski Date: Tue, 19 Sep 2023 17:18:01 +0200 Subject: [PATCH] Upgrade the Go tools to latest ones (#312) --- library.sh | 10 +++++----- test/unit/presubmit_test.go | 2 +- test/unit/update_deps_test.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/library.sh b/library.sh index a5490e08..40a95663 100755 --- a/library.sh +++ b/library.sh @@ -497,7 +497,7 @@ function report_go_test() { logfile="${logfile/.xml/.jsonl}" echo "Running go test with args: ${go_test_args[*]}" local gotest_retcode=0 - go_run gotest.tools/gotestsum@v1.8.0 \ + go_run gotest.tools/gotestsum@v1.10.1 \ --format "${GO_TEST_VERBOSITY:-testname}" \ --junitfile "${xml}" \ --junitfile-testsuite-name relative \ @@ -510,14 +510,14 @@ function report_go_test() { echo "Test log (JSONL) written to ${logfile}" ansilog="${logfile/.jsonl/-ansi.log}" - go_run github.com/haveyoudebuggedit/gotestfmt/v2/cmd/gotestfmt@v2.3.1 \ + go_run github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@v2.5.0 \ -input "${logfile}" \ -showteststatus \ -nofail > "$ansilog" echo "Test log (ANSI) written to ${ansilog}" htmllog="${logfile/.jsonl/.html}" - go_run github.com/buildkite/terminal-to-html/v3/cmd/terminal-to-html@v3.6.1 \ + go_run github.com/buildkite/terminal-to-html/v3/cmd/terminal-to-html@v3.9.1 \ --preview < "$ansilog" > "$htmllog" echo "Test log (HTML) written to ${htmllog}" @@ -793,7 +793,7 @@ function update_licenses() { local dst=$1 local dir=$2 shift - go_run github.com/google/go-licenses@v1.2.1 \ + go_run github.com/google/go-licenses@v1.6.0 \ save "${dir}" --save_path="${dst}" --force || \ { echo "--- FAIL: go-licenses failed to update licenses"; return 1; } } @@ -801,7 +801,7 @@ function update_licenses() { # Run go-licenses to check for forbidden licenses. function check_licenses() { # Check that we don't have any forbidden licenses. - go_run github.com/google/go-licenses@v1.2.1 \ + go_run github.com/google/go-licenses@v1.6.0 \ check "${REPO_ROOT_DIR}/..." || \ { echo "--- FAIL: go-licenses failed the license check"; return 1; } } diff --git a/test/unit/presubmit_test.go b/test/unit/presubmit_test.go index 5e4d4ac9..697936ac 100644 --- a/test/unit/presubmit_test.go +++ b/test/unit/presubmit_test.go @@ -38,7 +38,7 @@ func TestMainFunc(t *testing.T) { contains("Unit tests for knative.dev/hack/schema"), contains("Unit tests for knative.dev/hack"), contains("Running go test with args: -short -race -count 1 ./..."), - contains("go run gotest.tools/gotestsum@v1.8.0 --format testname --junitfile"), + contains("go run gotest.tools/gotestsum@v1.10.1 --format testname --junitfile"), contains("-- -short -race -count 1 ./..."), contains("UNIT TESTS PASSED"), }, diff --git a/test/unit/update_deps_test.go b/test/unit/update_deps_test.go index 4fa1cd66..5d58e46d 100644 --- a/test/unit/update_deps_test.go +++ b/test/unit/update_deps_test.go @@ -26,7 +26,7 @@ func TestUpdateDeps(t *testing.T) { contains("Removing unwanted vendor files"), contains("go mod tidy"), contains("go mod vendor"), - contains("go run github.com/google/go-licenses@v1.2.1 save ./... " + + contains("go run github.com/google/go-licenses@v1.6.0 save ./... " + "--save_path=third_party/VENDOR-LICENSE --force"), }, }, {