Skip to content

Commit 012fb79

Browse files
authored
Merge pull request #9751 from starius/bump-deps
multi: update Go to 1.23.10 and update some packages
2 parents 9059a4e + aff7570 commit 012fb79

File tree

26 files changed

+389
-295
lines changed

26 files changed

+389
-295
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ env:
3434

3535
# If you change this please also update GO_VERSION in Makefile (then run
3636
# `make lint` to see where else it needs to be updated as well).
37-
GO_VERSION: 1.23.9
37+
GO_VERSION: 1.23.10
3838

3939
jobs:
4040
########################

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ defaults:
1212
env:
1313
# If you change this please also update GO_VERSION in Makefile (then run
1414
# `make lint` to see where else it needs to be updated as well).
15-
GO_VERSION: 1.23.9
15+
GO_VERSION: 1.23.10
1616

1717
jobs:
1818
main:

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
run:
22
# If you change this please also update GO_VERSION in Makefile (then run
33
# `make lint` to see where else it needs to be updated as well).
4-
go: "1.23.9"
4+
go: "1.23.10"
55

66
# Abort after 10 minutes.
77
timeout: 10m

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# If you change this please also update GO_VERSION in Makefile (then run
22
# `make lint` to see where else it needs to be updated as well).
3-
FROM golang:1.23.9-alpine as builder
3+
FROM golang:1.23.10-alpine as builder
44

55
# Force Go to use the cgo based DNS resolver. This is required to ensure DNS
66
# queries required to connect to linked containers succeed.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ACTIVE_GO_VERSION_MINOR := $(shell echo $(ACTIVE_GO_VERSION) | cut -d. -f2)
2828
# GO_VERSION is the Go version used for the release build, docker files, and
2929
# GitHub Actions. This is the reference version for the project. All other Go
3030
# versions are checked against this version.
31-
GO_VERSION = 1.23.9
31+
GO_VERSION = 1.23.10
3232

3333
GOBUILD := $(GOCC) build -v
3434
GOINSTALL := $(GOCC) install -v

dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# If you change this please also update GO_VERSION in Makefile (then run
22
# `make lint` to see where else it needs to be updated as well).
3-
FROM golang:1.23.9-alpine AS builder
3+
FROM golang:1.23.10-alpine AS builder
44

55
LABEL maintainer="Olaoluwa Osuntokun <laolu@lightning.engineering>"
66

docker/btcd/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# If you change this please also update GO_VERSION in Makefile (then run
22
# `make lint` to see where else it needs to be updated as well).
3-
FROM golang:1.23.9-alpine as builder
3+
FROM golang:1.23.10-alpine as builder
44

55
LABEL maintainer="Olaoluwa Osuntokun <laolu@lightning.engineering>"
66

docs/INSTALL.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,45 +93,45 @@ following build dependencies are required:
9393

9494
### Installing Go
9595

96-
`lnd` is written in Go, with a minimum version of `1.23.9` (or, in case this
96+
`lnd` is written in Go, with a minimum version of `1.23.10` (or, in case this
9797
document gets out of date, whatever the Go version in the main `go.mod` file
9898
requires). To install, run one of the following commands for your OS:
9999

100100
<details>
101101
<summary>Linux (x86-64)</summary>
102102

103103
```
104-
wget https://dl.google.com/go/go1.23.9.linux-amd64.tar.gz
105-
sha256sum go1.23.9.linux-amd64.tar.gz | awk -F " " '{ print $1 }'
104+
wget https://dl.google.com/go/go1.23.10.linux-amd64.tar.gz
105+
sha256sum go1.23.10.linux-amd64.tar.gz | awk -F " " '{ print $1 }'
106106
```
107107

108108
The final output of the command above should be
109-
`de03e45d7a076c06baaa9618d42b3b6a0561125b87f6041c6397680a71e5bb26`. If it
109+
`535f9f81802499f2a7dbfa70abb8fda3793725fcc29460f719815f6e10b5fd60`. If it
110110
isn't, then the target REPO HAS BEEN MODIFIED, and you shouldn't install
111111
this version of Go. If it matches, then proceed to install Go:
112112
```
113-
sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.23.9.linux-amd64.tar.gz
113+
sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.23.10.linux-amd64.tar.gz
114114
export PATH=$PATH:/usr/local/go/bin
115115
```
116116
</details>
117117

118118
<details>
119119
<summary>Linux (ARMv6)</summary>
120-
120+
121121
```
122-
wget https://dl.google.com/go/go1.23.9.linux-armv6l.tar.gz
123-
sha256sum go1.23.9.linux-armv6l.tar.gz | awk -F " " '{ print $1 }'
122+
wget https://dl.google.com/go/go1.23.10.linux-armv6l.tar.gz
123+
sha256sum go1.23.10.linux-armv6l.tar.gz | awk -F " " '{ print $1 }'
124124
```
125125

126126
The final output of the command above should be
127-
`ade33880caacb8919b48767e0957e9880f2cdf634e137402a6f22552504136dd`. If it
127+
`b6e00c9a72406d394b9f167e74670e28b72ed559cca8115b21be1cb9d5316cb4`. If it
128128
isn't, then the target REPO HAS BEEN MODIFIED, and you shouldn't install
129129
this version of Go. If it matches, then proceed to install Go:
130130
```
131-
sudo rm -rf /usr/local/go && tar -C /usr/local -xzf go1.23.9.linux-armv6l.tar.gz
131+
sudo rm -rf /usr/local/go && tar -C /usr/local -xzf go1.23.10.linux-armv6l.tar.gz
132132
export PATH=$PATH:/usr/local/go/bin
133-
```
134-
133+
```
134+
135135
</details>
136136

137137
<details>

go.mod

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@ require (
1919
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
2020
github.com/davecgh/go-spew v1.1.1
2121
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
22-
github.com/go-logr/logr v1.3.0 // indirect
23-
github.com/go-logr/stdr v1.2.2 // indirect
2422
github.com/gorilla/websocket v1.5.0
2523
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
2624
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
2725
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
28-
github.com/jackc/pgx/v4 v4.18.2
26+
github.com/jackc/pgx/v4 v4.18.3
2927
github.com/jackpal/gateway v1.0.5
3028
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad
3129
github.com/jedib0t/go-pretty/v6 v6.2.7
@@ -47,20 +45,18 @@ require (
4745
github.com/lightningnetwork/lnd/tor v1.1.6
4846
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796
4947
github.com/miekg/dns v1.1.43
50-
github.com/pkg/errors v0.9.1 // indirect
5148
github.com/prometheus/client_golang v1.11.1
52-
github.com/stretchr/testify v1.9.0
49+
github.com/stretchr/testify v1.10.0
5350
github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02
5451
github.com/urfave/cli v1.22.9
5552
go.etcd.io/etcd/client/pkg/v3 v3.5.12
5653
go.etcd.io/etcd/client/v3 v3.5.12
57-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
58-
golang.org/x/crypto v0.22.0
54+
golang.org/x/crypto v0.37.0
5955
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
6056
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028
61-
golang.org/x/net v0.24.0
62-
golang.org/x/sync v0.7.0
63-
golang.org/x/term v0.19.0
57+
golang.org/x/net v0.39.0
58+
golang.org/x/sync v0.13.0
59+
golang.org/x/term v0.31.0
6460
golang.org/x/time v0.3.0
6561
google.golang.org/grpc v1.59.0
6662
google.golang.org/protobuf v1.33.0
@@ -70,6 +66,7 @@ require (
7066
)
7167

7268
require (
69+
dario.cat/mergo v1.0.1 // indirect
7370
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
7471
github.com/Microsoft/go-winio v0.6.1 // indirect
7572
github.com/NebulousLabs/fastrand v0.0.0-20181203155948-6fb6489aac4e // indirect
@@ -89,15 +86,19 @@ require (
8986
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
9087
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
9188
github.com/decred/dcrd/lru v1.1.2 // indirect
92-
github.com/docker/cli v20.10.17+incompatible // indirect
93-
github.com/docker/docker v24.0.7+incompatible // indirect
89+
github.com/docker/cli v28.1.1+incompatible // indirect
90+
github.com/docker/docker v28.1.1+incompatible // indirect
9491
github.com/docker/go-connections v0.4.0 // indirect
9592
github.com/docker/go-units v0.5.0 // indirect
9693
github.com/dustin/go-humanize v1.0.1 // indirect
94+
github.com/felixge/httpsnoop v1.0.4 // indirect
9795
github.com/fergusstrange/embedded-postgres v1.25.0 // indirect
9896
github.com/fsnotify/fsnotify v1.5.4 // indirect
97+
github.com/go-logr/logr v1.4.2 // indirect
98+
github.com/go-logr/stdr v1.2.2 // indirect
99+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
99100
github.com/gogo/protobuf v1.3.2 // indirect
100-
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
101+
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
101102
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
102103
github.com/golang/protobuf v1.5.3 // indirect
103104
github.com/golang/snappy v0.0.4 // indirect
@@ -108,17 +109,17 @@ require (
108109
github.com/hashicorp/errwrap v1.1.0 // indirect
109110
github.com/hashicorp/go-multierror v1.1.1 // indirect
110111
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
111-
github.com/imdario/mergo v0.3.12 // indirect
112112
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
113113
github.com/jackc/pgconn v1.14.3 // indirect
114114
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438 // indirect
115115
github.com/jackc/pgio v1.0.0 // indirect
116116
github.com/jackc/pgpassfile v1.0.0 // indirect
117117
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
118-
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
119-
github.com/jackc/pgtype v1.14.0 // indirect
120-
github.com/jackc/pgx/v5 v5.3.1 // indirect
118+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
119+
github.com/jackc/pgtype v1.14.4 // indirect
120+
github.com/jackc/pgx/v5 v5.7.4 // indirect
121121
github.com/jackc/puddle v1.3.0 // indirect
122+
github.com/jackc/puddle/v2 v2.2.2 // indirect
122123
github.com/jonboulle/clockwork v0.2.2 // indirect
123124
github.com/json-iterator/go v1.1.11 // indirect
124125
github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 // indirect
@@ -129,7 +130,7 @@ require (
129130
github.com/mattn/go-isatty v0.0.20 // indirect
130131
github.com/mattn/go-runewidth v0.0.13 // indirect
131132
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
132-
github.com/mitchellh/mapstructure v1.4.1 // indirect
133+
github.com/moby/docker-image-spec v1.3.1 // indirect
133134
github.com/moby/term v0.5.0 // indirect
134135
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
135136
github.com/modern-go/reflect2 v1.0.1 // indirect
@@ -140,6 +141,7 @@ require (
140141
github.com/opencontainers/image-spec v1.0.2 // indirect
141142
github.com/opencontainers/runc v1.1.12 // indirect
142143
github.com/ory/dockertest/v3 v3.10.0 // indirect
144+
github.com/pkg/errors v0.9.1 // indirect
143145
github.com/pmezard/go-difflib v1.0.0 // indirect
144146
github.com/prometheus/client_model v0.2.0 // indirect
145147
github.com/prometheus/common v0.26.0 // indirect
@@ -167,20 +169,22 @@ require (
167169
go.etcd.io/etcd/pkg/v3 v3.5.12 // indirect
168170
go.etcd.io/etcd/raft/v3 v3.5.12 // indirect
169171
go.etcd.io/etcd/server/v3 v3.5.12 // indirect
172+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
170173
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
171-
go.opentelemetry.io/otel v1.20.0 // indirect
174+
go.opentelemetry.io/otel v1.35.0 // indirect
172175
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
173176
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
174-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
175-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
177+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
178+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
179+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
176180
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
177181
go.uber.org/atomic v1.7.0 // indirect
178182
go.uber.org/multierr v1.6.0 // indirect
179183
go.uber.org/zap v1.17.0 // indirect
180-
golang.org/x/mod v0.16.0 // indirect
181-
golang.org/x/sys v0.19.0 // indirect
182-
golang.org/x/text v0.14.0 // indirect
183-
golang.org/x/tools v0.19.0 // indirect
184+
golang.org/x/mod v0.17.0 // indirect
185+
golang.org/x/sys v0.32.0 // indirect
186+
golang.org/x/text v0.24.0 // indirect
187+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
184188
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
185189
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
186190
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
@@ -216,6 +220,6 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d
216220
// If you change this please also update docs/INSTALL.md and GO_VERSION in
217221
// Makefile (then run `make lint` to see where else it needs to be updated as
218222
// well).
219-
go 1.23.6
223+
go 1.23.10
220224

221225
retract v0.0.2

0 commit comments

Comments
 (0)