Skip to content

Commit 331ac78

Browse files
guggeroguggero
authored
Merge pull request #1422 from lightninglabs/lnd-19
Update lnd compile-time dependency to v0.19
2 parents 4852be4 + eae358a commit 331ac78

File tree

92 files changed

+1260
-1202
lines changed

Some content is hidden

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

92 files changed

+1260
-1202
lines changed

‎.github/actions/setup-go/action.yml

-27
This file was deleted.

‎.github/workflows/main.yaml

+80-51
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ env:
1919
# go needs absolute directories, using the $HOME variable doesn't work here.
2020
GOPATH: /home/runner/work/go
2121

22-
GO_VERSION: '1.22.12'
22+
GO_VERSION: '1.23.6'
2323

24-
LITD_ITEST_BRANCH: 'master'
24+
LITD_ITEST_BRANCH: 'lnd-19'
2525

2626
jobs:
2727
#######################
@@ -32,10 +32,12 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: git checkout
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636

37-
- name: Setup go environment
38-
uses: ./.github/actions/setup-go
37+
- name: Setup go ${{ env.GO_VERSION }}
38+
uses: actions/setup-go@v5
39+
with:
40+
go-version: '${{ env.GO_VERSION }}'
3941

4042
- name: docker image cache
4143
uses: jpribyl/[email protected]
@@ -49,10 +51,12 @@ jobs:
4951
runs-on: ubuntu-latest
5052
steps:
5153
- name: git checkout
52-
uses: actions/checkout@v3
54+
uses: actions/checkout@v4
5355

54-
- name: Setup go environment
55-
uses: ./.github/actions/setup-go
56+
- name: Setup go ${{ env.GO_VERSION }}
57+
uses: actions/setup-go@v5
58+
with:
59+
go-version: '${{ env.GO_VERSION }}'
5660

5761
- name: Generate RPC stubs and check REST annotations
5862
run: make rpc-check
@@ -62,10 +66,12 @@ jobs:
6266
runs-on: ubuntu-latest
6367
steps:
6468
- name: git checkout
65-
uses: actions/checkout@v3
69+
uses: actions/checkout@v4
6670

67-
- name: Setup go environment
68-
uses: ./.github/actions/setup-go
71+
- name: Setup go ${{ env.GO_VERSION }}
72+
uses: actions/setup-go@v3
73+
with:
74+
go-version: '${{ env.GO_VERSION }}'
6975

7076
- name: Run go mod tidy
7177
run: make mod-check
@@ -75,10 +81,12 @@ jobs:
7581
runs-on: ubuntu-latest
7682
steps:
7783
- name: git checkout
78-
uses: actions/checkout@v3
84+
uses: actions/checkout@v4
7985

80-
- name: Setup go environment
81-
uses: ./.github/actions/setup-go
86+
- name: Setup go ${{ env.GO_VERSION }}
87+
uses: actions/setup-go@v5
88+
with:
89+
go-version: '${{ env.GO_VERSION }}'
8290

8391
- name: Run test vector creation check
8492
run: make test-vector-check
@@ -88,7 +96,7 @@ jobs:
8896
runs-on: ubuntu-latest
8997
steps:
9098
- name: git checkout
91-
uses: actions/checkout@v3
99+
uses: actions/checkout@v4
92100

93101
- name: Run migration check
94102
run: make migration-check
@@ -101,10 +109,12 @@ jobs:
101109
runs-on: ubuntu-latest
102110
steps:
103111
- name: git checkout
104-
uses: actions/checkout@v3
112+
uses: actions/checkout@v4
105113

106-
- name: Setup go environment
107-
uses: ./.github/actions/setup-go
114+
- name: Setup go ${{ env.GO_VERSION }}
115+
uses: actions/setup-go@v5
116+
with:
117+
go-version: '${{ env.GO_VERSION }}'
108118

109119
- name: compile code
110120
run: go install -v ./...
@@ -120,10 +130,12 @@ jobs:
120130
runs-on: ubuntu-latest
121131
steps:
122132
- name: git checkout
123-
uses: actions/checkout@v3
133+
uses: actions/checkout@v4
124134

125-
- name: setup go environment
126-
uses: ./.github/actions/setup-go
135+
- name: Setup go ${{ env.GO_VERSION }}
136+
uses: actions/setup-go@v5
137+
with:
138+
go-version: '${{ env.GO_VERSION }}'
127139

128140
- name: check default values in sample-tapd.conf file
129141
run: make sample-conf-check
@@ -136,7 +148,7 @@ jobs:
136148
runs-on: ubuntu-latest
137149
steps:
138150
- name: git checkout
139-
uses: actions/checkout@v3
151+
uses: actions/checkout@v4
140152

141153
- name: Set up QEMU
142154
uses: docker/setup-qemu-action@v2
@@ -163,10 +175,12 @@ jobs:
163175
runs-on: ubuntu-latest
164176
steps:
165177
- name: git checkout
166-
uses: actions/checkout@v3
178+
uses: actions/checkout@v4
167179

168-
- name: setup go ${{ env.GO_VERSION }}
169-
uses: ./.github/actions/setup-go
180+
- name: Setup go ${{ env.GO_VERSION }}
181+
uses: actions/setup-go@v5
182+
with:
183+
go-version: '${{ env.GO_VERSION }}'
170184

171185
- name: build release for all architectures
172186
run: make release
@@ -179,12 +193,14 @@ jobs:
179193
runs-on: ubuntu-latest
180194
steps:
181195
- name: git checkout
182-
uses: actions/checkout@v3
196+
uses: actions/checkout@v4
183197
with:
184198
fetch-depth: 0
185199

186-
- name: Setup go environment
187-
uses: ./.github/actions/setup-go
200+
- name: Setup go ${{ env.GO_VERSION }}
201+
uses: actions/setup-go@v5
202+
with:
203+
go-version: '${{ env.GO_VERSION }}'
188204

189205
- name: run lint
190206
run: make lint
@@ -197,10 +213,12 @@ jobs:
197213
runs-on: ubuntu-latest
198214
steps:
199215
- name: git checkout
200-
uses: actions/checkout@v3
216+
uses: actions/checkout@v4
201217

202-
- name: Setup go environment
203-
uses: ./.github/actions/setup-go
218+
- name: Setup go ${{ env.GO_VERSION }}
219+
uses: actions/setup-go@v5
220+
with:
221+
go-version: '${{ env.GO_VERSION }}'
204222

205223
- name: run format
206224
run: make fmt
@@ -221,21 +239,24 @@ jobs:
221239
- unit dbbackend=postgres
222240
steps:
223241
- name: git checkout
224-
uses: actions/checkout@v3
242+
uses: actions/checkout@v4
225243

226-
- name: Setup go environment
227-
uses: ./.github/actions/setup-go
244+
- name: Setup go ${{ env.GO_VERSION }}
245+
uses: actions/setup-go@v5
246+
with:
247+
go-version: '${{ env.GO_VERSION }}'
228248

229249
- name: run ${{ matrix.unit_type }}
230250
run: make ${{ matrix.unit_type }}
231251

232252
- name: Send coverage
233-
uses: shogo82148/actions-goveralls@v1
253+
uses: coverallsapp/github-action@v2
234254
if: matrix.unit_type == 'unit-cover'
235255
continue-on-error: true
236256
with:
237-
path-to-profile: coverage.txt
257+
file: coverage.txt
238258
flag-name: 'unit'
259+
format: 'golang'
239260
parallel: true
240261

241262
########################
@@ -246,10 +267,12 @@ jobs:
246267
runs-on: ubuntu-latest
247268
steps:
248269
- name: git checkout
249-
uses: actions/checkout@v3
270+
uses: actions/checkout@v4
250271

251-
- name: Setup go environment
252-
uses: ./.github/actions/setup-go
272+
- name: Setup go ${{ env.GO_VERSION }}
273+
uses: actions/setup-go@v5
274+
with:
275+
go-version: '${{ env.GO_VERSION }}'
253276

254277
- name: run itest
255278
run: make itest cover=1
@@ -267,12 +290,13 @@ jobs:
267290
retention-days: 5
268291

269292
- name: Send coverage
270-
uses: shogo82148/actions-goveralls@v1
293+
uses: coverallsapp/github-action@v2
271294
if: ${{ success() }}
272295
continue-on-error: true
273296
with:
274-
path-to-profile: itest/coverage.txt
297+
file: itest/coverage.txt
275298
flag-name: 'itest'
299+
format: 'golang'
276300
parallel: true
277301

278302
########################
@@ -283,10 +307,12 @@ jobs:
283307
runs-on: ubuntu-latest
284308
steps:
285309
- name: git checkout
286-
uses: actions/checkout@v3
310+
uses: actions/checkout@v4
287311

288-
- name: Setup go environment
289-
uses: ./.github/actions/setup-go
312+
- name: Setup go ${{ env.GO_VERSION }}
313+
uses: actions/setup-go@v5
314+
with:
315+
go-version: '${{ env.GO_VERSION }}'
290316

291317
- name: run itest
292318
run: make itest dbbackend=postgres cover=1
@@ -304,12 +330,13 @@ jobs:
304330
retention-days: 5
305331

306332
- name: Send coverage
307-
uses: shogo82148/actions-goveralls@v1
333+
uses: coverallsapp/github-action@v2
308334
if: ${{ success() }}
309335
continue-on-error: true
310336
with:
311-
path-to-profile: itest/coverage.txt
337+
file: itest/coverage.txt
312338
flag-name: 'itest'
339+
format: 'golang'
313340
parallel: true
314341

315342
########################
@@ -321,13 +348,15 @@ jobs:
321348

322349
steps:
323350
- name: git checkout
324-
uses: actions/checkout@v3
351+
uses: actions/checkout@v4
325352

326-
- name: Setup go environment
327-
uses: ./.github/actions/setup-go
353+
- name: Setup go ${{ env.GO_VERSION }}
354+
uses: actions/setup-go@v5
355+
with:
356+
go-version: '${{ env.GO_VERSION }}'
328357

329358
- name: Clone Lit repository
330-
uses: actions/checkout@v3
359+
uses: actions/checkout@v4
331360
with:
332361
repository: lightninglabs/lightning-terminal
333362
ref: ${{ env.LITD_ITEST_BRANCH }}
@@ -365,7 +394,7 @@ jobs:
365394
needs: [unit-test]
366395
runs-on: ubuntu-latest
367396
steps:
368-
- uses: shogo82148/actions-goveralls@v1
397+
- uses: coverallsapp/github-action@v2
369398
continue-on-error: true
370399
with:
371400
parallel-finished: true

‎.github/workflows/release.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ defaults:
1010
shell: bash
1111

1212
env:
13-
GO_VERSION: 1.22.12
13+
GO_VERSION: 1.23.6
1414

1515
jobs:
1616
main:
1717
name: Release build
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: git checkout
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v4
2222
with:
2323
fetch-depth: 0
2424

@@ -38,7 +38,7 @@ jobs:
3838
fi
3939
4040
- name: setup go ${{ env.GO_VERSION }}
41-
uses: actions/setup-go@v2
41+
uses: actions/setup-go@v5
4242
with:
4343
go-version: '${{ env.GO_VERSION }}'
4444

‎.golangci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ linters-settings:
2020
excludes:
2121
- G402 # Look for bad TLS connection settings.
2222
- G306 # Poor file permissions used when writing to a new file.
23+
- G601 # Implicit memory aliasing in for loop.
24+
- G115 # Integer overflow conversion.
2325
exhaustive:
2426
default-signifies-exhaustive: true
2527
gocritic:

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.12-alpine as builder
1+
FROM golang:1.23.6-alpine as builder
22

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

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ DOCKER_TOOLS = docker run \
5757
-v $(shell bash -c "mkdir -p /tmp/go-lint-cache; echo /tmp/go-lint-cache"):/root/.cache/golangci-lint \
5858
-v $$(pwd):/build taproot-assets-tools
5959

60-
GO_VERSION = 1.22.12
60+
GO_VERSION = 1.23.6
6161

6262
GREEN := "\\033[0;32m"
6363
NC := "\\033[0m"

‎address/log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package address
22

33
import (
4-
"github.com/btcsuite/btclog"
4+
"github.com/btcsuite/btclog/v2"
55
)
66

77
// Subsystem defines the logging code for this subsystem.

0 commit comments

Comments
 (0)