From 87844cd5b4900ed033eaefe862a5f1492130d09b Mon Sep 17 00:00:00 2001 From: ziggie Date: Thu, 7 Aug 2025 16:07:06 +0200 Subject: [PATCH] multi: bump Golang version to v1.23.12 --- .github/actions/setup-go/action.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/release.yaml | 2 +- .golangci.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- dev.Dockerfile | 2 +- docker/btcd/Dockerfile | 2 +- docs/INSTALL.md | 18 +++++++++--------- go.mod | 2 +- healthcheck/go.mod | 2 +- kvdb/go.mod | 2 +- lnrpc/Dockerfile | 2 +- lnrpc/gen_protos_docker.sh | 2 +- make/builder.Dockerfile | 2 +- sqldb/go.mod | 2 +- tlv/go.mod | 2 +- tools/Dockerfile | 2 +- tools/go.mod | 2 +- tor/go.mod | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/actions/setup-go/action.yml b/.github/actions/setup-go/action.yml index aa6a50f51..0f1313d67 100644 --- a/.github/actions/setup-go/action.yml +++ b/.github/actions/setup-go/action.yml @@ -52,7 +52,7 @@ runs: # The key is used to create and later look up the cache. It's made of # four parts: # - The base part is made from the OS name, Go version and a - # job-specified key prefix. Example: `linux-go-1.23.10-unit-test-`. + # job-specified key prefix. Example: `linux-go-1.23.12-unit-test-`. # It ensures that a job running on Linux with Go 1.23 only looks for # caches from the same environment. # - The unique part is the `hashFiles('**/go.sum')`, which calculates a diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 550830d28..7c4868da8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,7 +40,7 @@ env: # If you change this please also update GO_VERSION in Makefile (then run # `make lint` to see where else it needs to be updated as well). - GO_VERSION: 1.23.10 + GO_VERSION: 1.23.12 jobs: static-checks: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5224d153f..915869017 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -12,7 +12,7 @@ defaults: env: # If you change this please also update GO_VERSION in Makefile (then run # `make lint` to see where else it needs to be updated as well). - GO_VERSION: 1.23.10 + GO_VERSION: 1.23.12 jobs: main: diff --git a/.golangci.yml b/.golangci.yml index 9f1ab49a5..eaf737177 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,7 +1,7 @@ run: # If you change this please also update GO_VERSION in Makefile (then run # `make lint` to see where else it needs to be updated as well). - go: "1.23.10" + go: "1.23.12" # Abort after 10 minutes. timeout: 10m diff --git a/Dockerfile b/Dockerfile index 541586385..5cf4f96c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # If you change this please also update GO_VERSION in Makefile (then run # `make lint` to see where else it needs to be updated as well). -FROM golang:1.23.10-alpine as builder +FROM golang:1.23.12-alpine as builder # Force Go to use the cgo based DNS resolver. This is required to ensure DNS # queries required to connect to linked containers succeed. diff --git a/Makefile b/Makefile index c9a3baca5..97863b0e6 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ ACTIVE_GO_VERSION_MINOR := $(shell echo $(ACTIVE_GO_VERSION) | cut -d. -f2) # GO_VERSION is the Go version used for the release build, docker files, and # GitHub Actions. This is the reference version for the project. All other Go # versions are checked against this version. -GO_VERSION = 1.23.10 +GO_VERSION = 1.23.12 GOBUILD := $(GOCC) build -v GOINSTALL := $(GOCC) install -v diff --git a/dev.Dockerfile b/dev.Dockerfile index 6a3036c7e..aa584110b 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,6 +1,6 @@ # If you change this please also update GO_VERSION in Makefile (then run # `make lint` to see where else it needs to be updated as well). -FROM golang:1.23.10-alpine AS builder +FROM golang:1.23.12-alpine AS builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/docker/btcd/Dockerfile b/docker/btcd/Dockerfile index 0af869276..22d48a884 100644 --- a/docker/btcd/Dockerfile +++ b/docker/btcd/Dockerfile @@ -1,6 +1,6 @@ # If you change this please also update GO_VERSION in Makefile (then run # `make lint` to see where else it needs to be updated as well). -FROM golang:1.23.10-alpine as builder +FROM golang:1.23.12-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 1f8244c61..b953b6fdd 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -93,7 +93,7 @@ following build dependencies are required: ### Installing Go -`lnd` is written in Go, with a minimum version of `1.23.10` (or, in case this +`lnd` is written in Go, with a minimum version of `1.23.12` (or, in case this document gets out of date, whatever the Go version in the main `go.mod` file requires). To install, run one of the following commands for your OS: @@ -101,16 +101,16 @@ requires). To install, run one of the following commands for your OS: Linux (x86-64) ``` - wget https://dl.google.com/go/go1.23.10.linux-amd64.tar.gz - sha256sum go1.23.10.linux-amd64.tar.gz | awk -F " " '{ print $1 }' + wget https://dl.google.com/go/go1.23.12.linux-amd64.tar.gz + sha256sum go1.23.12.linux-amd64.tar.gz | awk -F " " '{ print $1 }' ``` The final output of the command above should be - `535f9f81802499f2a7dbfa70abb8fda3793725fcc29460f719815f6e10b5fd60`. If it + `d3847fef834e9db11bf64e3fb34db9c04db14e068eeb064f49af747010454f90`. If it isn't, then the target REPO HAS BEEN MODIFIED, and you shouldn't install this version of Go. If it matches, then proceed to install Go: ``` - sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.23.10.linux-amd64.tar.gz + sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.23.12.linux-amd64.tar.gz export PATH=$PATH:/usr/local/go/bin ``` @@ -119,16 +119,16 @@ requires). To install, run one of the following commands for your OS: Linux (ARMv6) ``` - wget https://dl.google.com/go/go1.23.10.linux-armv6l.tar.gz - sha256sum go1.23.10.linux-armv6l.tar.gz | awk -F " " '{ print $1 }' + wget https://dl.google.com/go/go1.23.12.linux-armv6l.tar.gz + sha256sum go1.23.12.linux-armv6l.tar.gz | awk -F " " '{ print $1 }' ``` The final output of the command above should be - `b6e00c9a72406d394b9f167e74670e28b72ed559cca8115b21be1cb9d5316cb4`. If it + `9704eba01401a3793f54fac162164b9c5d8cc6f3cab5cee72684bb72294d9f41`. If it isn't, then the target REPO HAS BEEN MODIFIED, and you shouldn't install this version of Go. If it matches, then proceed to install Go: ``` - sudo rm -rf /usr/local/go && tar -C /usr/local -xzf go1.23.10.linux-armv6l.tar.gz + sudo rm -rf /usr/local/go && tar -C /usr/local -xzf go1.23.12.linux-armv6l.tar.gz export PATH=$PATH:/usr/local/go/bin ``` diff --git a/go.mod b/go.mod index 06be59145..c321cf977 100644 --- a/go.mod +++ b/go.mod @@ -220,6 +220,6 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d // If you change this please also update docs/INSTALL.md and GO_VERSION in // Makefile (then run `make lint` to see where else it needs to be updated as // well). -go 1.23.10 +go 1.23.12 retract v0.0.2 diff --git a/healthcheck/go.mod b/healthcheck/go.mod index f459a9214..ac3635001 100644 --- a/healthcheck/go.mod +++ b/healthcheck/go.mod @@ -24,4 +24,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -go 1.23.10 +go 1.23.12 diff --git a/kvdb/go.mod b/kvdb/go.mod index b711afcb1..e37ff8398 100644 --- a/kvdb/go.mod +++ b/kvdb/go.mod @@ -147,4 +147,4 @@ replace github.com/ulikunitz/xz => github.com/ulikunitz/xz v0.5.11 // https://deps.dev/advisory/OSV/GO-2021-0053?from=%2Fgo%2Fgithub.com%252Fgogo%252Fprotobuf%2Fv1.3.1 replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2 -go 1.23.10 +go 1.23.12 diff --git a/lnrpc/Dockerfile b/lnrpc/Dockerfile index 05f916618..be8c9f7c0 100644 --- a/lnrpc/Dockerfile +++ b/lnrpc/Dockerfile @@ -1,6 +1,6 @@ # If you change this please also update GO_VERSION in Makefile (then run # `make lint` to see where else it needs to be updated as well). -FROM golang:1.23.10-bookworm +FROM golang:1.23.12-bookworm RUN apt-get update && apt-get install -y \ git \ diff --git a/lnrpc/gen_protos_docker.sh b/lnrpc/gen_protos_docker.sh index e72486359..2253bdc06 100755 --- a/lnrpc/gen_protos_docker.sh +++ b/lnrpc/gen_protos_docker.sh @@ -6,7 +6,7 @@ set -e DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # golang docker image version used in this script. -GO_IMAGE=docker.io/library/golang:1.23.10-alpine +GO_IMAGE=docker.io/library/golang:1.23.12-alpine PROTOBUF_VERSION=$(docker run --rm -v $DIR/../:/lnd -w /lnd $GO_IMAGE \ go list -f '{{.Version}}' -m google.golang.org/protobuf) diff --git a/make/builder.Dockerfile b/make/builder.Dockerfile index 66e9bc8c4..d2abf4b96 100644 --- a/make/builder.Dockerfile +++ b/make/builder.Dockerfile @@ -1,6 +1,6 @@ # If you change this please also update GO_VERSION in Makefile (then run # `make lint` to see where else it needs to be updated as well). -FROM golang:1.23.10-bookworm +FROM golang:1.23.12-bookworm MAINTAINER Olaoluwa Osuntokun diff --git a/sqldb/go.mod b/sqldb/go.mod index dbe0d2009..213042a2d 100644 --- a/sqldb/go.mod +++ b/sqldb/go.mod @@ -75,4 +75,4 @@ require ( modernc.org/token v1.1.0 // indirect ) -go 1.23.10 +go 1.23.12 diff --git a/tlv/go.mod b/tlv/go.mod index 383f6550a..531983386 100644 --- a/tlv/go.mod +++ b/tlv/go.mod @@ -22,4 +22,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -go 1.23.10 +go 1.23.12 diff --git a/tools/Dockerfile b/tools/Dockerfile index 43a34058e..a9b39edb2 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.10 +FROM golang:1.23.12 RUN apt-get update && apt-get install -y git ENV GOCACHE=/tmp/build/.cache diff --git a/tools/go.mod b/tools/go.mod index 5d40dc355..2b81efe6f 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module github.com/lightningnetwork/lnd/tools -go 1.23.10 +go 1.23.12 require ( github.com/btcsuite/btcd v0.24.2 diff --git a/tor/go.mod b/tor/go.mod index 98869a20b..2a12e29da 100644 --- a/tor/go.mod +++ b/tor/go.mod @@ -23,4 +23,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -go 1.23.10 +go 1.23.12