Skip to content

Update go.mod to 1.25 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthchr merged 5 commits into from
Apr 1, 2026
+17 −19
Merged

Update go.mod to 1.25 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f417850
Update go.mod to 1.25
jackfrancis Apr 1, 2026
afa481f
specify go 1.25
jackfrancis Apr 1, 2026
1125cbe
implement 1.25 reqs
jackfrancis Apr 1, 2026
228b1e0
simplified to get -tool usage
jackfrancis Apr 1, 2026
c2b6309
update v2 as well
jackfrancis Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ func Test_Cache_GetAvailabilityZones(t *testing.T) { //nolint:funlen
return a < b
}),
}...); diff != "" {
t.Errorf(diff)
t.Errorf("%s", diff)
}
})
}
Expand Down Expand Up @@ -568,7 +568,7 @@ func Test_Cache_GetVirtualMachineAvailabilityZonesForSize(t *testing.T) { //noli
return a < b
}),
}...); diff != "" {
t.Fatalf(diff)
t.Fatalf("%s", diff)
}
})
}
Expand Down
28 changes: 13 additions & 15 deletions ci/cover.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion v2/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading