diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 45a0f94ed..cb25f1a87 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,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.22.11 + GO_VERSION: 1.23.6 jobs: ######################## diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index aa83ef400..63c969303 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.22.11 + GO_VERSION: 1.23.6 jobs: main: diff --git a/.golangci.yml b/.golangci.yml index 0a23ca5f5..20c9411be 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.22.11" + go: "1.23.6" # Abort after 10 minutes. timeout: 10m diff --git a/Dockerfile b/Dockerfile index f5faab48c..2020ffefa 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.22.11-alpine as builder +FROM golang:1.23.6-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 2f70cf10d..645a8c780 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ endif # 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.22.11 +GO_VERSION = 1.23.6 GOBUILD := $(LOOPVARFIX) go build -v GOINSTALL := $(LOOPVARFIX) go install -v diff --git a/dev.Dockerfile b/dev.Dockerfile index 33acaf06a..b9911e430 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.22.11-alpine as builder +FROM golang:1.23.6-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/docker/btcd/Dockerfile b/docker/btcd/Dockerfile index 9bdd13587..6c617f1d9 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.22.11-alpine as builder +FROM golang:1.23.6-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/lnrpc/Dockerfile b/lnrpc/Dockerfile index f3658d789..18e57bb95 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.22.11-bookworm +FROM golang:1.23.6-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 78f1e5718..4f53098da 100755 --- a/lnrpc/gen_protos_docker.sh +++ b/lnrpc/gen_protos_docker.sh @@ -3,28 +3,28 @@ set -e # Directory of the script file, independent of where it's called from. -DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # golang docker image version used in this script. -GO_IMAGE=docker.io/library/golang:1.22.11-alpine +GO_IMAGE=docker.io/library/golang:1.23.6-alpine PROTOBUF_VERSION=$(docker run --rm -v $DIR/../:/lnd -w /lnd $GO_IMAGE \ - go list -f '{{.Version}}' -m google.golang.org/protobuf) + go list -f '{{.Version}}' -m google.golang.org/protobuf) GRPC_GATEWAY_VERSION=$(docker run --rm -v $DIR/../:/lnd -w /lnd $GO_IMAGE \ - go list -f '{{.Version}}' -m github.com/grpc-ecosystem/grpc-gateway/v2) + go list -f '{{.Version}}' -m github.com/grpc-ecosystem/grpc-gateway/v2) echo "Building protobuf compiler docker image..." docker build -t lnd-protobuf-builder \ - --build-arg PROTOBUF_VERSION="$PROTOBUF_VERSION" \ - --build-arg GRPC_GATEWAY_VERSION="$GRPC_GATEWAY_VERSION" \ - . + --build-arg PROTOBUF_VERSION="$PROTOBUF_VERSION" \ + --build-arg GRPC_GATEWAY_VERSION="$GRPC_GATEWAY_VERSION" \ + . echo "Compiling and formatting *.proto files..." docker run \ - --rm \ - --user "$UID:$(id -g)" \ - -e UID=$UID \ - -e COMPILE_MOBILE \ - -e SUBSERVER_PREFIX \ - -v "$DIR/../:/build" \ - lnd-protobuf-builder + --rm \ + --user "$UID:$(id -g)" \ + -e UID=$UID \ + -e COMPILE_MOBILE \ + -e SUBSERVER_PREFIX \ + -v "$DIR/../:/build" \ + lnd-protobuf-builder diff --git a/make/builder.Dockerfile b/make/builder.Dockerfile index 2f61cd6f8..c25ee6c96 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.22.11-bookworm +FROM golang:1.23.6-bookworm MAINTAINER Olaoluwa Osuntokun diff --git a/tools/Dockerfile b/tools/Dockerfile index aee837d51..47269143e 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.11 +FROM golang:1.23.6 RUN apt-get update && apt-get install -y git ENV GOCACHE=/tmp/build/.cache