Skip to content

Commit c16ce99

Browse files
committed
upgrade go to 1.25
1 parent b01b492 commit c16ce99

7 files changed

Lines changed: 19 additions & 18 deletions

File tree

.github/workflows/gotest.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- name: Set up Go
1010
uses: actions/setup-go@v5
1111
with:
12-
go-version: "1.21"
12+
go-version: "1.25"
1313
- name: go test
1414
run: go test -v -count=1 ./tsshd
1515
go-test-on-macos:
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v5
2222
with:
23-
go-version: "1.21"
23+
go-version: "1.25"
2424
- name: go test
2525
run: go test -v -count=1 ./tsshd
2626
go-test-on-windows:
@@ -31,7 +31,7 @@ jobs:
3131
- name: Set up Go
3232
uses: actions/setup-go@v5
3333
with:
34-
go-version: "1.21"
34+
go-version: "1.25"
3535
- name: go test
3636
run: go test -v -count=1 ./tsshd
3737
go-release-snapshot:
@@ -42,7 +42,7 @@ jobs:
4242
- name: Set up Go
4343
uses: actions/setup-go@v5
4444
with:
45-
go-version: "1.21"
45+
go-version: "1.25"
4646
- name: Run GoReleaser
4747
uses: goreleaser/goreleaser-action@v6
4848
with:
@@ -55,15 +55,16 @@ jobs:
5555
- name: Checkout trzsz-ssh
5656
uses: actions/checkout@v4
5757
- name: Set up Go
58-
uses: actions/setup-go@v5
59-
with:
60-
go-version: "1.21"
61-
- name: Revert Go1.21
6258
run: |
63-
cd $(go env GOROOT)
64-
curl https://github.com/golang/go/commit/9e43850a3298a9b8b1162ba0033d4c53f8637571.diff | patch --verbose -R -p 1
59+
wget -q https://github.com/thongtech/go-legacy-win7/releases/download/v1.25.2-1/go-legacy-win7-1.25.2-1.linux_amd64.tar.gz -O /tmp/go.tar.gz
60+
tar -C $HOME -xzf /tmp/go.tar.gz
6561
- name: Build tsshd
6662
run: |
63+
export GOROOT=$HOME/go-legacy-win7
64+
export GOPATH=$HOME/go
65+
export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
66+
which go
67+
go version
6768
go test -v -count=1 ./tsshd
6869
GOOS=windows GOARCH=386 go build -o tsshd_win7_i386/ ./cmd/tsshd/
6970
GOOS=windows GOARCH=amd64 go build -o tsshd_win7_x86_64/ ./cmd/tsshd/

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Set up Go
1313
uses: actions/setup-go@v5
1414
with:
15-
go-version: "1.21"
15+
go-version: "1.25"
1616
- name: Run GoReleaser
1717
uses: goreleaser/goreleaser-action@v6
1818
with:

README.cn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111

112112
</details>
113113

114-
- 用 Go 直接安装( 要求 go 1.24 以上 )
114+
- 用 Go 直接安装( 要求 go 1.25 以上 )
115115

116116
<details><summary><code>go install github.com/trzsz/tsshd/cmd/tsshd@latest</code></summary>
117117

@@ -123,7 +123,7 @@
123123
124124
</details>
125125
126-
- 用 Go 自己编译( 要求 go 1.24 以上 )
126+
- 用 Go 自己编译( 要求 go 1.25 以上 )
127127
128128
<details><summary><code>sudo make install</code></summary>
129129

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ The `tsshd` works like `mosh-server`, while the [`tssh --udp`](https://github.co
112112
113113
</details>
114114
115-
- Install with Go ( Requires go 1.24 or later )
115+
- Install with Go ( Requires go 1.25 or later )
116116
117117
<details><summary><code>go install github.com/trzsz/tsshd/cmd/tsshd@latest</code></summary>
118118
@@ -124,7 +124,7 @@ The `tsshd` works like `mosh-server`, while the [`tssh --udp`](https://github.co
124124
125125
</details>
126126
127-
- Build from source ( Requires go 1.24 or later )
127+
- Build from source ( Requires go 1.25 or later )
128128
129129
<details><summary><code>sudo make install</code></summary>
130130

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Section: utils
33
Priority: optional
44
Maintainer: Lonny Wong <lonnywong@qq.com>
55
Build-Depends: debhelper (>=9),
6-
golang-1.21-go
6+
golang-1.25-go
77
Standards-Version: 3.9.6
88
Homepage: https://trzsz.github.io/ssh
99
Vcs-Browser: https://github.com/trzsz/tsshd

debian/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ export CGO_ENABLED=0
33
export GOCACHE=/tmp/.cache/go-build
44

55
%:
6-
PATH="/usr/lib/go-1.21/bin:${PATH}" dh $@
6+
PATH="/usr/lib/go-1.25/bin:${PATH}" dh $@

go.mod

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

3-
go 1.24
3+
go 1.25
44

55
require (
66
github.com/UserExistsError/conpty v0.1.4

0 commit comments

Comments
 (0)