Skip to content

Commit 14b432d

Browse files
committed
Update x/tools for go v1.26 compatibility.
Also, *remove* `@latest` so `go install` respects the pins in go.mod. Also remove `stack: go 1.22` because that's apparently only for Linux [^1] and it's causing build problems. [^1]: appveyor/ci#3743 (comment)
1 parent 04cb87b commit 14b432d

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

appveyor.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,24 @@ branches:
1313
- master
1414

1515
environment:
16-
GOPATH: C:\gopath
17-
GOROOT: C:\go121
16+
GOROOT: C:\go122
1817
GOPY_APPVEYOR_CI: '1'
1918
GOTRACEBACK: 'crash'
2019
CPYTHON3DIR: "C:\\Python311-x64"
21-
PATH: '%GOPATH%\bin;%GOROOT%\bin;%CPYTHON3DIR%;%CPYTHON3DIR%\\Scripts;C:\msys64\mingw64\bin;C:\msys64\usr\bin\;%PATH%'
22-
23-
stack: go 1.21
20+
PATH: 'C:\go122\bin;%USERPROFILE%\go\bin;%CPYTHON3DIR%;%CPYTHON3DIR%\\Scripts;C:\msys64\mingw64\bin;C:\msys64\usr\bin\;%PATH%'
2421

2522
build_script:
2623
- python --version
2724
- "%CPYTHON3DIR%\\python --version"
2825
- "%CPYTHON3DIR%\\python -m pip install --upgrade pip"
2926
- "%CPYTHON3DIR%\\python -m pip install cffi"
3027
- "%CPYTHON3DIR%\\python -m pip install pybindgen"
28+
- "where go"
29+
- "C:\\go122\\bin\\go.exe version"
3130
- go version
3231
- go env
3332
- go get -v -t ./...
34-
- go install golang.org/x/tools/cmd/goimports@latest
33+
- go install golang.org/x/tools/cmd/goimports
3534

3635
test_script:
3736
- go test ./...

go.mod

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
module github.com/go-python/gopy
22

3-
go 1.19
3+
go 1.22.0
44

55
require (
66
github.com/gonuts/commander v0.1.0
77
github.com/gonuts/flag v0.1.0
88
github.com/pkg/errors v0.9.1
9-
golang.org/x/tools v0.16.0
9+
golang.org/x/tools v0.26.0
1010
)
1111

12-
require golang.org/x/mod v0.14.0 // indirect
12+
require (
13+
golang.org/x/mod v0.21.0 // indirect
14+
golang.org/x/sync v0.8.0 // indirect
15+
)

go.sum

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ github.com/gonuts/flag v0.1.0 h1:fqMv/MZ+oNGu0i9gp0/IQ/ZaPIDoAZBOBaJoV7viCWM=
44
github.com/gonuts/flag v0.1.0/go.mod h1:ZTmTGtrSPejTo/SRNhCqwLTmiAgyBdCkLYhHrAoBdz4=
55
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
66
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
7-
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
8-
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
9-
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
10-
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
11-
golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
12-
golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
13-
golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=
14-
golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
7+
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
8+
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
9+
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
10+
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
11+
golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
12+
golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=

0 commit comments

Comments
 (0)