From f41785044ca097c358519b8ac062540d50226864 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Wed, 1 Apr 2026 11:43:05 -0700 Subject: [PATCH 1/5] Update go.mod to 1.25 Signed-off-by: Jack Francis --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 4af3a20..1c76391 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/Azure/skewer -go 1.18 +go 1.25 require ( github.com/Azure/azure-sdk-for-go v68.0.0+incompatible From afa481f414bf1a2c0e0c7440285fdc5ca28ea129 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Wed, 1 Apr 2026 11:50:18 -0700 Subject: [PATCH 2/5] specify go 1.25 Signed-off-by: Jack Francis --- ci/cover.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/ci/cover.sh b/ci/cover.sh index 022308c..815b5b3 100755 --- a/ci/cover.sh +++ b/ci/cover.sh @@ -8,9 +8,25 @@ function deps() { mkdir -p "${GITHUB_WORKSPACE}/tmp" pushd "${GITHUB_WORKSPACE}/tmp" go mod init tmp - go install github.com/axw/gocov/gocov@latest - go install github.com/AlekSi/gocov-xml@latest - go install github.com/wadey/gocovmerge@latest + cat > tools.go <<'EOF' +//go:build tools + +package tools + +import ( + _ "github.com/axw/gocov/gocov" + _ "github.com/AlekSi/gocov-xml" + _ "github.com/wadey/gocovmerge" +) +EOF + go get github.com/axw/gocov/gocov@latest + go get github.com/AlekSi/gocov-xml@latest + go get github.com/wadey/gocovmerge@latest + go get golang.org/x/tools@latest + go mod tidy + go install github.com/axw/gocov/gocov + go install github.com/AlekSi/gocov-xml + go install github.com/wadey/gocovmerge cp "$(go env GOPATH)/bin/gocov" "${GITHUB_WORKSPACE}/bin/gocov" cp "$(go env GOPATH)/bin/gocov-xml" "${GITHUB_WORKSPACE}/bin/gocov-xml" cp "$(go env GOPATH)/bin/gocovmerge" "${GITHUB_WORKSPACE}/bin/gocovmerge" @@ -19,6 +35,7 @@ function deps() { } function init() { + export GOTOOLCHAIN=go1.25.0 go env mkdir -p "${GITHUB_WORKSPACE}/bin" mkdir -p "${GITHUB_WORKSPACE}/tmp" From 1125cbea395ed4e99a8d0ef058879d76aef91d69 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Wed, 1 Apr 2026 12:31:57 -0700 Subject: [PATCH 3/5] implement 1.25 reqs Signed-off-by: Jack Francis --- cache_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cache_test.go b/cache_test.go index 3d27d85..a3b1601 100644 --- a/cache_test.go +++ b/cache_test.go @@ -418,7 +418,7 @@ func Test_Cache_GetAvailabilityZones(t *testing.T) { //nolint:funlen return a < b }), }...); diff != "" { - t.Errorf(diff) + t.Errorf("%s", diff) } }) } @@ -568,7 +568,7 @@ func Test_Cache_GetVirtualMachineAvailabilityZonesForSize(t *testing.T) { //noli return a < b }), }...); diff != "" { - t.Fatalf(diff) + t.Fatalf("%s", diff) } }) } From 228b1e093c334ce860705575e6ae28785e823f93 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Wed, 1 Apr 2026 12:47:26 -0700 Subject: [PATCH 4/5] simplified to get -tool usage Signed-off-by: Jack Francis --- ci/cover.sh | 39 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/ci/cover.sh b/ci/cover.sh index 815b5b3..208b4dd 100755 --- a/ci/cover.sh +++ b/ci/cover.sh @@ -4,42 +4,23 @@ set -o pipefail set -o nounset set -x -function deps() { - mkdir -p "${GITHUB_WORKSPACE}/tmp" - pushd "${GITHUB_WORKSPACE}/tmp" - go mod init tmp - cat > tools.go <<'EOF' -//go:build tools - -package tools +TOOLMOD="${GITHUB_WORKSPACE}/.tools" -import ( - _ "github.com/axw/gocov/gocov" - _ "github.com/AlekSi/gocov-xml" - _ "github.com/wadey/gocovmerge" -) -EOF - go get github.com/axw/gocov/gocov@latest - go get github.com/AlekSi/gocov-xml@latest - go get github.com/wadey/gocovmerge@latest +function deps() { + mkdir -p "${TOOLMOD}" + pushd "${TOOLMOD}" + go mod init tools + go get -tool github.com/axw/gocov/gocov@latest + go get -tool github.com/AlekSi/gocov-xml@latest + go get -tool github.com/wadey/gocovmerge@latest go get golang.org/x/tools@latest go mod tidy - go install github.com/axw/gocov/gocov - go install github.com/AlekSi/gocov-xml - go install github.com/wadey/gocovmerge - cp "$(go env GOPATH)/bin/gocov" "${GITHUB_WORKSPACE}/bin/gocov" - cp "$(go env GOPATH)/bin/gocov-xml" "${GITHUB_WORKSPACE}/bin/gocov-xml" - cp "$(go env GOPATH)/bin/gocovmerge" "${GITHUB_WORKSPACE}/bin/gocovmerge" popd - rm -rf "${GITHUB_WORKSPACE}/tmp" } function init() { export GOTOOLCHAIN=go1.25.0 go env - mkdir -p "${GITHUB_WORKSPACE}/bin" - mkdir -p "${GITHUB_WORKSPACE}/tmp" - export PATH=$PATH:${GITHUB_WORKSPACE}/bin } function test() { @@ -55,10 +36,10 @@ function test() { # Merge coverage files echo "Merging coverage files..." - gocovmerge coverage-v1.out coverage-v2.out > coverage.out + go -C "${TOOLMOD}" tool gocovmerge "${GITHUB_WORKSPACE}/coverage-v1.out" "${GITHUB_WORKSPACE}/coverage-v2.out" > coverage.out # Convert merged coverage to XML - gocov convert coverage.out | gocov-xml > coverage.xml + go -C "${TOOLMOD}" tool gocov convert "${GITHUB_WORKSPACE}/coverage.out" | go -C "${TOOLMOD}" tool gocov-xml > coverage.xml # Clean up intermediate files rm coverage-v1.out coverage-v2.out coverage.out From c2b6309e8486de8f2bb69c28c935bf25da9dc000 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Wed, 1 Apr 2026 13:30:24 -0700 Subject: [PATCH 5/5] update v2 as well Signed-off-by: Jack Francis --- v2/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2/go.mod b/v2/go.mod index d12e158..b5821e7 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -1,6 +1,6 @@ module github.com/Azure/skewer/v2 -go 1.23.0 +go 1.25 require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1