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) } }) } diff --git a/ci/cover.sh b/ci/cover.sh index 022308c..208b4dd 100755 --- a/ci/cover.sh +++ b/ci/cover.sh @@ -4,25 +4,23 @@ set -o pipefail set -o nounset set -x +TOOLMOD="${GITHUB_WORKSPACE}/.tools" + 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 - 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" + 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 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() { @@ -38,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 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 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