Skip to content

Commit 4aca077

Browse files
authored
Merge pull request #6443 from oasisprotocol/peternose/internal/bump-go-1.25.5
go: Bump Go to 1.25.5
2 parents b621fb4 + 15716b1 commit 4aca077

9 files changed

Lines changed: 16 additions & 15 deletions

File tree

.changelog/6443.internal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
go: Bump Go to 1.25.5

.github/workflows/ci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Set up Go
4747
uses: actions/setup-go@v6
4848
with:
49-
go-version: ">=1.25.3"
49+
go-version: ">=1.25.5"
5050
- name: Set up Rust
5151
run: rustup show
5252
- name: Install dependencies

.github/workflows/ci-reproducibility.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Set up Go
4040
uses: actions/setup-go@v6
4141
with:
42-
go-version: ">=1.25.3"
42+
go-version: ">=1.25.5"
4343
- name: Set up Rust
4444
working-directory: build${{ matrix.build_number }}
4545
run: rustup show

.github/workflows/release-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Set up Go
3636
uses: actions/setup-go@v6
3737
with:
38-
go-version: ">=1.25.3"
38+
go-version: ">=1.25.5"
3939
- name: Set up Rust
4040
run: rustup show
4141
- name: Install Oasis Node prerequisites

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Set up Go
3939
uses: actions/setup-go@v6
4040
with:
41-
go-version: ">=1.25.3"
41+
go-version: ">=1.25.5"
4242

4343
- name: Set up Rust
4444
run: rustup show

docker/oasis-core-dev/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
FROM ubuntu:22.04
22

33
# Package versions.
4-
ARG GO_VERSION=1.25.3
4+
ARG GO_VERSION=1.25.5
55
ARG GO_NANCY_VERSION=1.0.33
66
ARG GO_NANCY_CHECKSUM=a4bf5290d41b095c04f941ed5380674770c79d59735e33b1bd07a5cd5fbb135d
77
ARG GO_PROTOC_VERSION=3.6.1
88
ARG GO_PROTOC_GEN_GO_VERSION=1.21.0
9-
ARG GOLANGCILINT_VERSION=2.6.0
9+
ARG GOLANGCILINT_VERSION=2.8.0
1010
ARG GOCOVMERGE_VERSION=b5bfa59ec0adc420475f97f89b58045c721d761c
1111
ARG GOFUMPT_VERSION=v0.8.0
1212
ARG GOIMPORTS_VERSION=v0.36.0

docs/development-setup/prerequisites.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Core:
4040
```
4141
<!-- markdownlint-enable line-length -->
4242

43-
* [Go] (at least version 1.25.3).
43+
* [Go] (at least version 1.25.5).
4444

4545
If your distribution provides a new-enough version of Go, just use that.
4646

@@ -52,18 +52,18 @@ Core:
5252
* [ensure `$GOPATH/bin` is in your `PATH`](
5353
https://tip.golang.org/doc/code.html#GOPATH),
5454
* [install the desired version of Go](
55-
https://golang.org/doc/install#extra_versions), e.g. 1.25.3, with:
55+
https://golang.org/doc/install#extra_versions), e.g. 1.25.5, with:
5656

5757
```
58-
go install golang.org/dl/go1.25.3@latest
59-
go1.25.3 download
58+
go install golang.org/dl/go1.25.5@latest
59+
go1.25.5 download
6060
```
6161
6262
* instruct the build system to use this particular version of Go by setting
6363
the `OASIS_GO` environment variable in your `~/.bashrc`:
6464
6565
```
66-
export OASIS_GO=go1.25.3
66+
export OASIS_GO=go1.25.5
6767
```
6868
6969
* [Rust].
@@ -151,7 +151,7 @@ Core:
151151
```
152152
curl -sSfL \
153153
https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
154-
| sh -s -- -b $(${OASIS_GO:-go} env GOPATH)/bin v2.6.0
154+
| sh -s -- -b $(${OASIS_GO:-go} env GOPATH)/bin v2.8.0
155155
```
156156
157157
* (**OPTIONAL**) [protoc-gen-go].

go/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module github.com/oasisprotocol/oasis-core/go
22

3+
go 1.25.5
4+
35
replace (
46
github.com/cometbft/cometbft => github.com/oasisprotocol/cometbft v0.37.16-oasis1
57

@@ -205,5 +207,3 @@ require (
205207
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
206208
lukechampine.com/blake3 v1.4.1 // indirect
207209
)
208-
209-
go 1.25.3

tests/upgrade/post/go.mod

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

3-
go 1.25.3
3+
go 1.25.5
44

55
replace (
66
github.com/cometbft/cometbft => github.com/oasisprotocol/cometbft v0.37.2-oasis1

0 commit comments

Comments
 (0)