From ab7723aafad644553cb6b5549d7b39760b02145c Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Wed, 14 Aug 2024 11:38:28 -0700 Subject: [PATCH] build: set min build version to Go 1.22.6 Go 1.23 was released this week, so with this PR we update the build system to officially support the last two releases. --- .github/workflows/main.yml | 2 +- .github/workflows/release.yaml | 3 +-- .golangci.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- dev.Dockerfile | 2 +- docker/btcd/Dockerfile | 2 +- docs/INSTALL.md | 6 +++--- go.mod | 2 +- lnrpc/Dockerfile | 2 +- lnrpc/gen_protos_docker.sh | 2 +- make/builder.Dockerfile | 2 +- 12 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2dc0ad163b..fe4a64d66a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ env: # /dev.Dockerfile # /make/builder.Dockerfile # /.github/workflows/release.yml - GO_VERSION: 1.22.5 + GO_VERSION: 1.22.6 jobs: ######################## diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 702734cf8f..d7e932e158 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,12 +11,11 @@ defaults: env: # If you change this value, please change it in the following files as well: - # /.travis.yml # /Dockerfile # /dev.Dockerfile # /make/builder.Dockerfile # /.github/workflows/main.yml - GO_VERSION: 1.22.5 + GO_VERSION: 1.22.6 jobs: main: diff --git a/.golangci.yml b/.golangci.yml index f3de207048..3b19be23e2 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -57,7 +57,7 @@ linters-settings: - G306 # Poor file permissions used when writing to a new file. staticcheck: - go: "1.22.5" + go: "1.22.6" checks: ["-SA1019"] lll: diff --git a/Dockerfile b/Dockerfile index 683eff81a9..3a6f642b1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # /make/builder.Dockerfile # /.github/workflows/main.yml # /.github/workflows/release.yml -FROM golang:1.22.5-alpine as builder +FROM golang:1.22.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 52c754df9b..f0557c472f 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.5 +GO_VERSION = 1.22.6 GOBUILD := $(LOOPVARFIX) go build -v GOINSTALL := $(LOOPVARFIX) go install -v diff --git a/dev.Dockerfile b/dev.Dockerfile index c0d4572bb4..945e6a5b5d 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -3,7 +3,7 @@ # /make/builder.Dockerfile # /.github/workflows/main.yml # /.github/workflows/release.yml -FROM golang:1.22.5-alpine as builder +FROM golang:1.22.6-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/docker/btcd/Dockerfile b/docker/btcd/Dockerfile index 0a54540c8e..0bb29c898d 100644 --- a/docker/btcd/Dockerfile +++ b/docker/btcd/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.5-alpine as builder +FROM golang:1.22.6-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 3090835f3d..3b7f7cf4b2 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -100,12 +100,12 @@ the following commands for your OS: Linux (x86-64) ``` - wget https://dl.google.com/go/go1.22.5.linux-amd64.tar.gz + wget https://dl.google.com/go/go1.22.6.linux-amd64.tar.gz sha256sum go1.22.5.linux-amd64.tar.gz | awk -F " " '{ print $1 }' ``` The final output of the command above should be - `904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0`. If it + `999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616`. 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: ``` @@ -123,7 +123,7 @@ the following commands for your OS: ``` The final output of the command above should be - `8c4587cf3e63c9aefbcafa92818c4d9d51683af93ea687bf6c7508d6fa36f85e`. If it + `b566484fe89a54c525dd1a4cbfec903c1f6e8f0b7b3dbaf94c79bc9145391083`. 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: ``` diff --git a/go.mod b/go.mod index 1436797845..1e38b1dcc9 100644 --- a/go.mod +++ b/go.mod @@ -237,6 +237,6 @@ replace github.com/lightninglabs/neutrino => github.com/djkazic/neutrino v0.16.1 // If you change this please also update .github/pull_request_template.md, // docs/INSTALL.md and GO_IMAGE in lnrpc/gen_protos_docker.sh. -go 1.22.3 +go 1.22.6 retract v0.0.2 diff --git a/lnrpc/Dockerfile b/lnrpc/Dockerfile index 0f74d5e360..253e54f16a 100644 --- a/lnrpc/Dockerfile +++ b/lnrpc/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.5-bookworm +FROM golang:1.22.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 edf97e06b9..1472f5c5fa 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.21.4-alpine +GO_IMAGE=docker.io/library/golang:1.22.6-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 db227983a1..86762006d4 100644 --- a/make/builder.Dockerfile +++ b/make/builder.Dockerfile @@ -3,7 +3,7 @@ # /dev.Dockerfile # /.github/workflows/main.yml # /.github/workflows/release.yml -FROM golang:1.22.5-bookworm +FROM golang:1.22.6-bookworm MAINTAINER Olaoluwa Osuntokun