Skip to content

Commit 10bd5c4

Browse files
update to Go 1.26, drop Go 1.24 (#243)
* update to Go 1.26, drop Go 1.24 * remove synctest wrapper
1 parent 9d448b1 commit 10bd5c4

File tree

7 files changed

+6
-60
lines changed

7 files changed

+6
-60
lines changed

.github/workflows/interop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
go: [ "1.24.x", "1.25.x" ]
12+
go: [ "1.25.x", "1.26.x" ]
1313
steps:
1414
- uses: actions/checkout@v6
1515
- uses: nanasess/setup-chromedriver@v2

.github/workflows/lint.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
go: [ "1.24.x", "1.25.x" ]
11+
go: [ "1.25.x", "1.26.x" ]
1212
runs-on: ubuntu-latest
1313
name: Lint
14-
env:
15-
GOEXPERIMENT: ${{ matrix.go == '1.24.x' && 'synctest' || '' }}
1614
steps:
1715
- uses: actions/checkout@v6
1816
- uses: actions/setup-go@v6
@@ -33,4 +31,4 @@ jobs:
3331
uses: golangci/golangci-lint-action@v9
3432
with:
3533
args: --timeout=3m
36-
version: v2.7.2
34+
version: v2.9.0

.github/workflows/unit.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
os: [ "ubuntu", "windows", "macos" ]
12-
go: [ "1.24.x", "1.25.x" ]
12+
go: [ "1.25.x", "1.26.x" ]
1313
runs-on: ${{ fromJSON(vars[format('UNIT_RUNNER_{0}', matrix.os)] || format('"{0}-latest"', matrix.os)) }}
1414
name: Unit tests (${{ matrix.os}}, Go ${{ matrix.go }})
15-
env:
16-
GOEXPERIMENT: ${{ matrix.go == '1.24.x' && 'synctest' || '' }}
1715
steps:
1816
- uses: actions/checkout@v6
1917
- uses: actions/setup-go@v6

go.mod

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

3-
go 1.24
3+
go 1.25
44

55
require (
66
github.com/dunglas/httpsfv v1.1.0

internal/synctest/synctest_go124.go

Lines changed: 0 additions & 19 deletions
This file was deleted.

internal/synctest/synctest_go125.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

session_manager_test.go

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@ import (
88
"net"
99
"net/http"
1010
"net/http/httptest"
11-
"runtime"
1211
"slices"
1312
"strconv"
14-
"strings"
1513
"testing"
14+
"testing/synctest"
1615
"time"
1716

18-
"github.com/quic-go/webtransport-go/internal/synctest"
19-
2017
"github.com/quic-go/quic-go"
2118
"github.com/quic-go/quic-go/http3"
2219
"github.com/quic-go/quic-go/quicvarint"
@@ -123,12 +120,6 @@ func TestSessionManagerAddingStreams(t *testing.T) {
123120
}
124121

125122
func TestSessionManagerStreamReordering(t *testing.T) {
126-
// synctest works slightly differently on Go 1.24,
127-
// so we skip the test
128-
if strings.HasPrefix(runtime.Version(), "go1.24") {
129-
t.Skip("skipping on Go 1.24 due to synctest issues")
130-
}
131-
132123
synctest.Test(t, func(t *testing.T) {
133124
clientPacketConn, serverPacketConn, closeFn := newSimnetLink(t, 10*time.Millisecond)
134125
defer closeFn(t)
@@ -264,12 +255,6 @@ func TestSessionManagerStreamReordering(t *testing.T) {
264255
}
265256

266257
func TestSessionManagerSessionClose(t *testing.T) {
267-
// synctest works slightly differently on Go 1.24,
268-
// so we skip the test
269-
if strings.HasPrefix(runtime.Version(), "go1.24") {
270-
t.Skip("skipping on Go 1.24 due to synctest issues")
271-
}
272-
273258
synctest.Test(t, func(t *testing.T) {
274259
const rtt = 10 * time.Millisecond
275260
clientPacketConn, serverPacketConn, closeFn := newSimnetLink(t, rtt)

0 commit comments

Comments
 (0)