Skip to content

Commit 23b1edf

Browse files
committed
chore: update to Go 1.26.2
1 parent 0a8c7f2 commit 23b1edf

12 files changed

Lines changed: 16 additions & 17 deletions

File tree

.github/workflows/go-version.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# .github/workflows/go-version.env
2-
GO_VERSION=1.23
2+
GO_VERSION=1.26.2

DOCKER/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Use a build arg to ensure that both stages use the same,
22
# hopefully current, go version.
3-
ARG GOLANG_BASE_IMAGE=golang:1.23-alpine
3+
ARG GOLANG_BASE_IMAGE=golang:1.26-alpine
44

55
# stage 1 Generate CometBFT Binary
66
FROM --platform=$BUILDPLATFORM $GOLANG_BASE_IMAGE as builder
@@ -58,4 +58,3 @@ CMD ["node"]
5858

5959
# Expose the data directory as a volume since there's mutable state in there
6060
VOLUME [ "$CMTHOME" ]
61-

README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,7 @@ Please see [SECURITY.md](./SECURITY.md).
6262

6363
| CometBFT version | Requirement | Version | Tested with |
6464
|------------------|-------------|----------------|--------------|
65-
| main | Go version | 1.23 or higher | up to 1.23.6 |
66-
| v1.x | Go version | 1.23 or higher | up to 1.23.1 |
67-
| v0.38.x | Go version | 1.22 or higher | up to 1.22 |
68-
| v0.37.x | Go version | 1.22 or higher | up to 1.22 |
69-
| v0.34.x | Go version | 1.22 or higher | up to 1.22 |
65+
| v1.x-inj | Go version | 1.26 or higher | up to 1.26.2 |
7066

7167
### Install
7268

api/go.mod

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

3-
go 1.23
3+
go 1.26.2
44

55
require (
66
github.com/cosmos/gogoproto v1.4.12

docs/tutorials/go-built-in.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ The go.mod file should look similar to:
142142
```go
143143
module kvstore
144144

145-
go 1.23
145+
go 1.26.2
146146

147147
require github.com/cometbft/cometbft v1.0.0 // indirect
148148
```

docs/tutorials/go.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ The go.mod file should look similar to:
137137
```go
138138
module kvstore
139139
140-
go 1.23
140+
go 1.26.2
141141
142142
143143
require github.com/cometbft/cometbft v1.0.0 // indirect

go.mod

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

3-
go 1.23.9
3+
go 1.26.2
44

55
require (
66
github.com/BurntSushi/toml v1.4.0

go.work

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.23.9
1+
go 1.26.2
22

33
use (
44
.

internal/consensus/byzantine_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,10 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
253253
// Evidence should be submitted and committed at the third height but
254254
// we will check the first six just in case
255255
evidenceFromEachValidator := make([]types.Evidence, nValidators)
256+
// The CI test split runs this package with -race alongside many other
257+
// packages in the same go test invocation, so give evidence propagation
258+
// extra headroom for slower cold runs.
259+
evidenceCommitTimeout := 2 * time.Minute
256260

257261
wg := new(sync.WaitGroup)
258262
for i := 0; i < nValidators; i++ {
@@ -288,7 +292,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
288292
assert.Equal(t, prevoteHeight, ev.Height())
289293
}
290294
}
291-
case <-time.After(60 * time.Second):
295+
case <-time.After(evidenceCommitTimeout):
292296
t.Fatalf("Timed out waiting for validators to commit evidence")
293297
}
294298
}

rpc/jsonrpc/server/ws_handler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestWebsocketManagerHandler(t *testing.T) {
2323
require.NoError(t, err)
2424

2525
if got, want := dialResp.StatusCode, http.StatusSwitchingProtocols; got != want {
26-
t.Errorf("dialResp.StatusCode = %q, want %q", got, want)
26+
t.Errorf("dialResp.StatusCode = %d, want %d", got, want)
2727
}
2828

2929
// check basic functionality works

0 commit comments

Comments
 (0)