Skip to content

Commit bdfb7d5

Browse files
authored
Merge pull request #834 from oasisprotocol/ptrus/feature/go-1.23
Update go to 1.23.x
2 parents 0d27e93 + a8c6668 commit bdfb7d5

File tree

12 files changed

+92
-89
lines changed

12 files changed

+92
-89
lines changed

.changelog/834.internal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update Go to v1.23.3

.github/workflows/ci-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,6 @@ jobs:
9494
uses: golangci/golangci-lint-action@v3
9595
with:
9696
# Update README.md instructions when bumping this.
97-
version: v1.55.1
97+
version: v1.62.2
9898
# Always run this step so that all linting errors can be seen at once.
9999
if: always()

.github/workflows/ci-test.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: Set up Go
5050
uses: actions/setup-go@v5
5151
with:
52-
go-version: 1.22.x
52+
go-version: 1.23.x
5353
- name: Install Go tools
5454
run: go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.12
5555
- name: Build Go
@@ -60,7 +60,7 @@ jobs:
6060
# NOTE: This should run _after_ the build step, so that oapi-codegen has already run
6161
# and generated the Go code that points to some of the dependencies.
6262
run: |
63-
go mod tidy -v -x -compat=1.22 # goreleaser does the same; can find lingering issues
63+
go mod tidy -v -x -compat=1.23 # goreleaser does the same; can find lingering issues
6464
echo TIDY RESULTS START; git diff || true; echo TIDY RESULTS END
6565
- name: Upload to codecov.io
6666
uses: codecov/codecov-action@v3.1.0
@@ -105,7 +105,7 @@ jobs:
105105
- name: Set up Go
106106
uses: actions/setup-go@v5
107107
with:
108-
go-version: 1.22.x
108+
go-version: 1.23.x
109109
- name: Autogenerate Go code
110110
run: |
111111
go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.12
@@ -149,7 +149,7 @@ jobs:
149149
- name: Set up Go
150150
uses: actions/setup-go@v5
151151
with:
152-
go-version: 1.22.x
152+
go-version: 1.23.x
153153
- name: Autogenerate Go code
154154
run: |
155155
go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.12

.golangci.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55

66
run:
77
timeout: 5m
8-
skip-dirs:
8+
9+
issues:
10+
exclude-dirs:
911
# Contains a cloned subset of oasis-core. Some types are unused, some
1012
# formatting is haphazard. We don't care much; this code is meant to be
1113
# frozen in time.
1214
- coreapi
1315

14-
issues:
1516
exclude-rules:
1617
- path: '(.+)_test\.go'
1718
linters:
@@ -36,7 +37,6 @@ linters:
3637
- dogsled
3738
- errcheck
3839
- exhaustive
39-
- exportloopref
4040
- goconst
4141
- gocritic
4242
- gocyclo
@@ -74,7 +74,11 @@ linters-settings:
7474
default-signifies-exhaustive: true
7575
govet:
7676
# Enabled checking for shadowed variables.
77-
check-shadowing: true
77+
shadow: true
78+
gosec:
79+
excludes:
80+
# https://github.com/securego/gosec#available-rules
81+
- G115
7882
goimports:
7983
# Put local imports after 3rd-party packages.
8084
local-prefixes: github.com/oasisprotocol/nexus

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ create a PR, but without them, you're at the mercy of CI.
122122

123123
```sh
124124
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
125-
| sh -s -- -b $(go env GOPATH)/bin v1.55.1
125+
| sh -s -- -b $(go env GOPATH)/bin v1.62.2
126126
```
127127

128128
- **gofumpt**: `go install mvdan.cc/gofumpt@latest`

docker/nexus/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM golang:1.22-bookworm AS nexus-builder
1+
FROM golang:1.23-bookworm AS nexus-builder
22

33
WORKDIR /code/go
44

55
COPY . ./
66

77
RUN \
8-
go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.12 && \
8+
go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.12 && \
99
make codegen-go && \
1010
go mod download && \
1111
go build
@@ -20,7 +20,7 @@ RUN npx redoc-cli build api/spec/v1.yaml -o api/spec/v1.html
2020

2121
############
2222

23-
FROM golang:1.22-bookworm AS nexus
23+
FROM golang:1.23-bookworm AS nexus
2424

2525
WORKDIR /nexus
2626

docker/oasis-net-runner/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM golang:1.22-bookworm AS oasis-core
1+
FROM golang:1.23-bookworm AS oasis-core
22

3-
ARG OASIS_CORE_VERSION=23.0.2
3+
ARG OASIS_CORE_VERSION=24.3.1
44

55
WORKDIR /code/go
66

docker/oasis-node/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM golang:1.22-bookworm AS oasis-node
1+
FROM golang:1.23-bookworm AS oasis-node
22

3-
ARG OASIS_CORE_VERSION=23.0.2
3+
ARG OASIS_CORE_VERSION=24.3.1
44

55
WORKDIR /code/go
66

go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/oasisprotocol/nexus
22

3-
go 1.22.2
3+
go 1.23.4
44

55
replace (
66
github.com/cometbft/cometbft => github.com/oasisprotocol/cometbft v0.37.2-oasis1
@@ -19,10 +19,10 @@ require (
1919
github.com/google/uuid v1.6.0
2020
github.com/jackc/pgx/v5 v5.5.4
2121
github.com/knadh/koanf v1.4.1
22-
github.com/prometheus/client_golang v1.20.4
22+
github.com/prometheus/client_golang v1.20.5
2323
github.com/spf13/cobra v1.8.1
2424
github.com/stretchr/testify v1.9.0
25-
golang.org/x/sync v0.8.0
25+
golang.org/x/sync v0.10.0
2626
google.golang.org/grpc v1.67.1
2727
gopkg.in/yaml.v2 v2.4.0 // indirect
2828
)
@@ -91,13 +91,13 @@ require (
9191
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
9292
github.com/josharian/intern v1.0.0 // indirect
9393
github.com/kevinburke/ssh_config v1.2.0 // indirect
94-
github.com/klauspost/compress v1.17.10 // indirect
94+
github.com/klauspost/compress v1.17.11 // indirect
9595
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
9696
github.com/labstack/echo/v4 v4.9.1 // indirect
9797
github.com/labstack/gommon v0.4.0 // indirect
9898
github.com/lib/pq v1.10.9 // indirect
9999
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
100-
github.com/libp2p/go-libp2p v0.36.5 // indirect
100+
github.com/libp2p/go-libp2p v0.37.2 // indirect
101101
github.com/magiconair/properties v1.8.7 // indirect
102102
github.com/mailru/easyjson v0.7.7 // indirect
103103
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -117,7 +117,7 @@ require (
117117
github.com/multiformats/go-multibase v0.2.0 // indirect
118118
github.com/multiformats/go-multicodec v0.9.0 // indirect
119119
github.com/multiformats/go-multihash v0.2.3 // indirect
120-
github.com/multiformats/go-multistream v0.5.0 // indirect
120+
github.com/multiformats/go-multistream v0.6.0 // indirect
121121
github.com/multiformats/go-varint v0.0.7 // indirect
122122
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
123123
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
@@ -128,7 +128,7 @@ require (
128128
github.com/pkg/errors v0.9.1 // indirect
129129
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
130130
github.com/prometheus/client_model v0.6.1 // indirect
131-
github.com/prometheus/common v0.59.1 // indirect
131+
github.com/prometheus/common v0.60.0 // indirect
132132
github.com/prometheus/procfs v0.15.1 // indirect
133133
github.com/sagikazarmark/locafero v0.4.0 // indirect
134134
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -154,11 +154,11 @@ require (
154154
go.uber.org/atomic v1.11.0 // indirect
155155
go.uber.org/multierr v1.11.0 // indirect
156156
go.uber.org/zap v1.27.0 // indirect
157-
golang.org/x/mod v0.20.0 // indirect
157+
golang.org/x/mod v0.21.0 // indirect
158158
golang.org/x/net v0.30.0 // indirect
159-
golang.org/x/sys v0.26.0 // indirect
160-
golang.org/x/text v0.19.0 // indirect
161-
golang.org/x/tools v0.24.0 // indirect
159+
golang.org/x/sys v0.28.0 // indirect
160+
golang.org/x/text v0.21.0 // indirect
161+
golang.org/x/tools v0.26.0 // indirect
162162
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
163163
google.golang.org/grpc/security/advancedtls v0.0.0-20221004221323-12db695f1648 // indirect
164164
google.golang.org/protobuf v1.35.1 // indirect
@@ -176,10 +176,10 @@ require (
176176
github.com/fxamacker/cbor/v2 v2.4.0
177177
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a
178178
github.com/oasisprotocol/metadata-registry-tools v0.0.0-20240304080528-3218befba9ca
179-
github.com/oasisprotocol/oasis-core/go v0.2403.0
179+
github.com/oasisprotocol/oasis-core/go v0.2403.1
180180
github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.11.1
181181
github.com/rs/cors v1.8.3
182182
go.dedis.ch/kyber/v3 v3.1.0
183-
golang.org/x/crypto v0.28.0
184-
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
183+
golang.org/x/crypto v0.31.0
184+
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
185185
)

0 commit comments

Comments
 (0)