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.
This commit is contained in:
Olaoluwa Osuntokun 2024-08-14 11:38:28 -07:00 committed by Oliver Gugger
parent b4693b2010
commit 19b5a1fb05
No known key found for this signature in database
GPG Key ID: 8E4256593F177720
12 changed files with 14 additions and 15 deletions

View File

@ -31,7 +31,7 @@ env:
# /dev.Dockerfile # /dev.Dockerfile
# /make/builder.Dockerfile # /make/builder.Dockerfile
# /.github/workflows/release.yml # /.github/workflows/release.yml
GO_VERSION: 1.22.5 GO_VERSION: 1.22.6
jobs: jobs:
######################## ########################

View File

@ -11,12 +11,11 @@ defaults:
env: env:
# If you change this value, please change it in the following files as well: # If you change this value, please change it in the following files as well:
# /.travis.yml
# /Dockerfile # /Dockerfile
# /dev.Dockerfile # /dev.Dockerfile
# /make/builder.Dockerfile # /make/builder.Dockerfile
# /.github/workflows/main.yml # /.github/workflows/main.yml
GO_VERSION: 1.22.5 GO_VERSION: 1.22.6
jobs: jobs:
main: main:

View File

@ -57,7 +57,7 @@ linters-settings:
- G306 # Poor file permissions used when writing to a new file. - G306 # Poor file permissions used when writing to a new file.
staticcheck: staticcheck:
go: "1.22.5" go: "1.22.6"
checks: ["-SA1019"] checks: ["-SA1019"]
lll: lll:

View File

@ -3,7 +3,7 @@
# /make/builder.Dockerfile # /make/builder.Dockerfile
# /.github/workflows/main.yml # /.github/workflows/main.yml
# /.github/workflows/release.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 # Force Go to use the cgo based DNS resolver. This is required to ensure DNS
# queries required to connect to linked containers succeed. # queries required to connect to linked containers succeed.

View File

@ -35,7 +35,7 @@ endif
# GO_VERSION is the Go version used for the release build, docker files, and # 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 # GitHub Actions. This is the reference version for the project. All other Go
# versions are checked against this version. # versions are checked against this version.
GO_VERSION = 1.22.5 GO_VERSION = 1.22.6
GOBUILD := $(LOOPVARFIX) go build -v GOBUILD := $(LOOPVARFIX) go build -v
GOINSTALL := $(LOOPVARFIX) go install -v GOINSTALL := $(LOOPVARFIX) go install -v

View File

@ -3,7 +3,7 @@
# /make/builder.Dockerfile # /make/builder.Dockerfile
# /.github/workflows/main.yml # /.github/workflows/main.yml
# /.github/workflows/release.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 <laolu@lightning.engineering>" LABEL maintainer="Olaoluwa Osuntokun <laolu@lightning.engineering>"

View File

@ -1,4 +1,4 @@
FROM golang:1.22.5-alpine as builder FROM golang:1.22.6-alpine as builder
LABEL maintainer="Olaoluwa Osuntokun <laolu@lightning.engineering>" LABEL maintainer="Olaoluwa Osuntokun <laolu@lightning.engineering>"

View File

@ -100,12 +100,12 @@ the following commands for your OS:
<summary>Linux (x86-64)</summary> <summary>Linux (x86-64)</summary>
``` ```
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 }' sha256sum go1.22.5.linux-amd64.tar.gz | awk -F " " '{ print $1 }'
``` ```
The final output of the command above should be 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 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: 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 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 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: this version of Go. If it matches, then proceed to install Go:
``` ```

2
go.mod
View File

@ -206,6 +206,6 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d
// If you change this please also update .github/pull_request_template.md, // If you change this please also update .github/pull_request_template.md,
// docs/INSTALL.md and GO_IMAGE in lnrpc/gen_protos_docker.sh. // docs/INSTALL.md and GO_IMAGE in lnrpc/gen_protos_docker.sh.
go 1.21.4 go 1.22.6
retract v0.0.2 retract v0.0.2

View File

@ -1,4 +1,4 @@
FROM golang:1.22.5-bookworm FROM golang:1.22.6-bookworm
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
git \ git \

View File

@ -6,7 +6,7 @@ set -e
DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
# golang docker image version used in this script. # 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 \ 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)

View File

@ -3,7 +3,7 @@
# /dev.Dockerfile # /dev.Dockerfile
# /.github/workflows/main.yml # /.github/workflows/main.yml
# /.github/workflows/release.yml # /.github/workflows/release.yml
FROM golang:1.22.5-bookworm FROM golang:1.22.6-bookworm
MAINTAINER Olaoluwa Osuntokun <laolu@lightning.engineering> MAINTAINER Olaoluwa Osuntokun <laolu@lightning.engineering>