Skip to content

Commit c1129bb

Browse files
authored
Merge pull request #9183 from lightningnetwork/0-18-4-branch-rc1
release: create branch for v0.18.4-beta.rc1
2 parents d72a3aa + 9246d5c commit c1129bb

File tree

309 files changed

+24257
-9666
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

309 files changed

+24257
-9666
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ defaults:
2121
shell: bash
2222

2323
env:
24-
BITCOIN_VERSION: "27"
24+
BITCOIN_VERSION: "28"
2525

2626
TRANCHES: 8
2727

@@ -31,7 +31,7 @@ env:
3131
# /dev.Dockerfile
3232
# /make/builder.Dockerfile
3333
# /.github/workflows/release.yml
34-
GO_VERSION: 1.22.5
34+
GO_VERSION: 1.22.6
3535

3636
jobs:
3737
########################

.github/workflows/release.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ defaults:
1111

1212
env:
1313
# If you change this value, please change it in the following files as well:
14-
# /.travis.yml
1514
# /Dockerfile
1615
# /dev.Dockerfile
1716
# /make/builder.Dockerfile
1817
# /.github/workflows/main.yml
19-
GO_VERSION: 1.22.5
18+
GO_VERSION: 1.22.6
2019

2120
jobs:
2221
main:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ profile.tmp
6666
.DS_Store
6767

6868
.vscode
69+
*.code-workspace
6970

7071
# Coverage test
7172
coverage.txt

.golangci.yml

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
run:
2-
# timeout for analysis
3-
deadline: 10m
2+
go: "1.22.6"
43

5-
# Skip autogenerated files for mobile and gRPC as well as copied code for
6-
# internal use.
7-
skip-files:
8-
- "mobile\\/.*generated\\.go"
9-
- "\\.pb\\.go$"
10-
- "\\.pb\\.gw\\.go$"
11-
- "internal\\/musig2v040"
12-
13-
skip-dirs:
14-
- channeldb/migration_01_to_11
15-
- channeldb/migration/lnwire21
4+
# Abort after 10 minutes.
5+
timeout: 10m
166

177
build-tags:
188
- autopilotrpc
@@ -57,7 +47,6 @@ linters-settings:
5747
- G306 # Poor file permissions used when writing to a new file.
5848

5949
staticcheck:
60-
go: "1.22.5"
6150
checks: ["-SA1019"]
6251

6352
lll:
@@ -133,25 +122,15 @@ linters:
133122
- gochecknoinits
134123

135124
# Deprecated linters. See https://golangci-lint.run/usage/linters/.
136-
- interfacer
137-
- golint
138-
- maligned
139-
- scopelint
140-
- exhaustivestruct
141125
- bodyclose
142126
- contextcheck
143127
- nilerr
144128
- noctx
145129
- rowserrcheck
146130
- sqlclosecheck
147-
- structcheck
148131
- tparallel
149132
- unparam
150133
- wastedassign
151-
- ifshort
152-
- varcheck
153-
- deadcode
154-
- nosnakecase
155134

156135

157136
# Disable gofumpt as it has weird behavior regarding formatting multiple
@@ -191,7 +170,7 @@ linters:
191170
- wrapcheck
192171

193172
# Allow dynamic errors.
194-
- goerr113
173+
- err113
195174

196175
# We use ErrXXX instead.
197176
- errname
@@ -207,15 +186,41 @@ linters:
207186
# The linter is too aggressive and doesn't add much value since reviewers
208187
# will also catch magic numbers that make sense to extract.
209188
- gomnd
189+
- mnd
210190

211-
# Some of the tests cannot be parallelized. On the other hand, we don't
212-
# gain much performance with this check so we disable it for now until
213-
# unit tests become our CI bottleneck.
191+
# Some of the tests cannot be parallelized. On the other hand, we don't
192+
# gain much performance with this check so we disable it for now until
193+
# unit tests become our CI bottleneck.
214194
- paralleltest
215195

196+
# New linters that we haven't had time to address yet.
197+
- testifylint
198+
- perfsprint
199+
- inamedparam
200+
- copyloopvar
201+
- tagalign
202+
- protogetter
203+
- revive
204+
- depguard
205+
- gosmopolitan
206+
- intrange
207+
208+
216209
issues:
217210
# Only show newly introduced problems.
218-
new-from-rev: 8c66353e4c02329abdacb5a8df29998035ec2e24
211+
new-from-rev: 77c7f776d5cbf9e147edc81d65ae5ba177a684e5
212+
213+
# Skip autogenerated files for mobile and gRPC as well as copied code for
214+
# internal use.
215+
skip-files:
216+
- "mobile\\/.*generated\\.go"
217+
- "\\.pb\\.go$"
218+
- "\\.pb\\.gw\\.go$"
219+
- "internal\\/musig2v040"
220+
221+
skip-dirs:
222+
- channeldb/migration_01_to_11
223+
- channeldb/migration/lnwire21
219224

220225
exclude-rules:
221226
# Exclude gosec from running for tests so that tests with weak randomness
@@ -256,8 +261,8 @@ issues:
256261
- forbidigo
257262
- godot
258263

259-
# Allow fmt.Printf() in lncli.
260-
- path: cmd/lncli/*
264+
# Allow fmt.Printf() in commands.
265+
- path: cmd/commands/*
261266
linters:
262267
- forbidigo
263268

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# /make/builder.Dockerfile
44
# /.github/workflows/main.yml
55
# /.github/workflows/release.yml
6-
FROM golang:1.22.5-alpine as builder
6+
FROM golang:1.22.6-alpine as builder
77

88
# Force Go to use the cgo based DNS resolver. This is required to ensure DNS
99
# queries required to connect to linked containers succeed.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ endif
3535
# GO_VERSION is the Go version used for the release build, docker files, and
3636
# GitHub Actions. This is the reference version for the project. All other Go
3737
# versions are checked against this version.
38-
GO_VERSION = 1.22.5
38+
GO_VERSION = 1.22.6
3939

4040
GOBUILD := $(LOOPVARFIX) go build -v
4141
GOINSTALL := $(LOOPVARFIX) go install -v

0 commit comments

Comments
 (0)