Skip to content

Commit 03ade59

Browse files
authored
Merge pull request #4015 from dougm/bump-go-mod
chore: bump go.mod min go version to 1.25
2 parents 2f37c2c + 4ddffe5 commit 03ade59

8 files changed

Lines changed: 10 additions & 14 deletions

File tree

.github/workflows/govmomi-go-tests.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,3 @@ jobs:
4949
TEST_TIMEOUT: 5m
5050
TEST_OPTS: ""
5151
run: make go-test
52-
53-
- name: Debug on Failure
54-
if: ${{ failure() }}
55-
uses: mxschmitt/action-tmate@c0afd6f790e3a5564914980036ebf83216678101 # v3.23

.github/workflows/govmomi-govc-tests.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ jobs:
5454
run: |
5555
make ${{ matrix.cmd }}
5656
57-
- name: Debug on Failure
58-
if: ${{ failure() }}
59-
uses: mxschmitt/action-tmate@c0afd6f790e3a5564914980036ebf83216678101 # v3.23
60-
6157
govc-docs:
6258
name: Verify Updated Docs
6359
strategy:

.goreleaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
project_name: govmomi
44

55
env:
6-
- GO_VERSION=1.24
6+
- GO_VERSION=1.26
77
- ALPINE_VERSION=3.21
88

99
builds:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/vmware/govmomi
22

3-
go 1.24.0 // required for slices/maps package and built-in clear function
3+
go 1.25.0
44

55
require (
66
github.com/a8m/tree v0.0.0-20240104212747-2c8764a5f17e

govc/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/vmware/govmomi/govc
22

3-
go 1.24.0
3+
go 1.25.0
44

55
replace github.com/vmware/govmomi => ../
66

govc/test/test_helper.bash

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ GOVC_TEST_ISO=govc-images/$(basename $GOVC_TEST_ISO_SRC)
3434
GOVC_TEST_IMG_SRC=$GOVC_IMAGES/floppybird.img
3535
GOVC_TEST_IMG=govc-images/$(basename $GOVC_TEST_IMG_SRC)
3636

37-
PATH="$GOPATH/bin:$PATH"
37+
if [ -n "$GOPATH" ]; then
38+
PATH="$GOPATH/bin:$PATH"
39+
else
40+
PATH="$(go env GOPATH)/bin:$PATH"
41+
fi
3842

3943
require_docker() {
4044
if ! docker version ; then

hack/tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/vmware/govmomi-tools
22

3-
go 1.23.0
3+
go 1.25.0
44

55
require github.com/golangci/golangci-lint v1.64.6
66

vcsim/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/vmware/govmomi/vcsim
22

3-
go 1.24.0
3+
go 1.25.0
44

55
replace github.com/vmware/govmomi => ../
66

0 commit comments

Comments
 (0)