Skip to content

Commit 1bf419e

Browse files
authored
Merge pull request #1006 from ellemouton/goBump
multi: go version and linter bump
2 parents ef923d5 + 6dbb68b commit 1bf419e

File tree

11 files changed

+390
-354
lines changed

11 files changed

+390
-354
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
# If you change this value, please change it in the following files as well:
2222
# /Dockerfile
2323
# /dev.Dockerfile
24-
GO_VERSION: 1.22.6
24+
GO_VERSION: 1.23.6
2525

2626
jobs:
2727
########################
@@ -318,8 +318,8 @@ jobs:
318318
uses: actions/upload-artifact@v4
319319
if: ${{ failure() }}
320320
with:
321-
name: logs-itest
322-
path: logs-itest.zip
321+
name: logs-itest-${{ matrix.name }}
322+
path: logs-itest-${{ matrix.name }}.zip
323323
retention-days: 5
324324

325325
########################

.golangci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ linters-settings:
3131
excludes:
3232
- G402 # Look for bad TLS connection settings.
3333
- G306 # Poor file permissions used when writing to a new file.
34+
- G601 # Implicit memory aliasing in for loop.
35+
- G115 # Integer overflow in conversion.
36+
3437
staticcheck:
35-
go: "1.22.6"
3638
checks: ["-SA1019"]
3739

3840
linters:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN apk add --no-cache --update alpine-sdk \
3232

3333
# The first stage is already done and all static assets should now be generated
3434
# in the app/build sub directory.
35-
FROM golang:1.22.6-alpine@sha256:1a478681b671001b7f029f94b5016aed984a23ad99c707f6a0ab6563860ae2f3 as golangbuilder
35+
FROM golang:1.23.6-alpine@sha256:f8113c4b13e2a8b3a168dceaee88ac27743cc84e959f43b9dbd2291e9c3f57a0 as golangbuilder
3636

3737
# Instead of checking out from git again, we just copy the whole working
3838
# directory of the previous stage that includes the generated static assets.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PUBLIC_URL :=
2121
# GO_VERSION is the Go version used for the release build, docker files, and
2222
# GitHub Actions. This is the reference version for the project. All other Go
2323
# versions are checked against this version.
24-
GO_VERSION = 1.22.6
24+
GO_VERSION = 1.23.6
2525

2626
LOOP_COMMIT := $(shell cat go.mod | \
2727
grep $(LOOP_PKG) | \

dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN cd /go/src/github.com/lightninglabs/lightning-terminal/app \
1313

1414
# The first stage is already done and all static assets should now be generated
1515
# in the app/build sub directory.
16-
FROM golang:1.22.6-alpine@sha256:1a478681b671001b7f029f94b5016aed984a23ad99c707f6a0ab6563860ae2f3 as golangbuilder
16+
FROM golang:1.23.6-alpine@sha256:f8113c4b13e2a8b3a168dceaee88ac27743cc84e959f43b9dbd2291e9c3f57a0 as golangbuilder
1717

1818
# Instead of checking out from git again, we just copy the whole working
1919
# directory of the previous stage that includes the generated static assets.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,4 +238,4 @@ replace (
238238
// taproot-assets dependency to function properly.
239239
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display
240240

241-
go 1.22.6
241+
go 1.23.6

litrpc/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.6-bookworm@sha256:d31e093e3aeaee68ccee6c4c96e554ef0f192ea37ae684d91b206bec17377f19
1+
FROM golang:1.23.6-bookworm@sha256:462f68e1109cc0415f58ba591f11e650b38e193fddc4a683a3b77d29be8bfb2c
22

33
RUN apt-get update && apt-get install -y \
44
git \

make/builder.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.6-bookworm@sha256:d31e093e3aeaee68ccee6c4c96e554ef0f192ea37ae684d91b206bec17377f19
1+
FROM golang:1.23.6-bookworm@sha256:462f68e1109cc0415f58ba591f11e650b38e193fddc4a683a3b77d29be8bfb2c
22

33
MAINTAINER Olaoluwa Osuntokun <[email protected]>
44

tools/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.6-bookworm@sha256:d31e093e3aeaee68ccee6c4c96e554ef0f192ea37ae684d91b206bec17377f19
1+
FROM golang:1.23.6-bookworm@sha256:462f68e1109cc0415f58ba591f11e650b38e193fddc4a683a3b77d29be8bfb2c
22

33
RUN apt-get update && apt-get install -y git
44
ENV GOCACHE=/tmp/build/.cache

tools/go.mod

Lines changed: 107 additions & 101 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)