Skip to content

Commit 70e0b79

Browse files
ellemoutonellemouton
committed
temp: trying to fix linter and android build
1 parent 0c3ee4e commit 70e0b79

File tree

7 files changed

+25
-26
lines changed

7 files changed

+25
-26
lines changed

‎.github/workflows/main.yml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: git checkout
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v3
3131

3232
- name: go cache
33-
uses: actions/cache@v1
33+
uses: actions/cache@v3
3434
with:
3535
path: /home/runner/work/go
3636
key: lnc-${{ runner.os }}-go-${{ env.GO_VERSION }}-${{ github.job }}-${{ hashFiles('**/go.sum') }}
@@ -49,11 +49,14 @@ jobs:
4949
run: make build
5050

5151
- name: gomobile install
52-
run: go install golang.org/x/mobile/cmd/gomobile@v0.0.0-20220928052126-fa6bcb076835
52+
run: go install golang.org/x/mobile/cmd/gomobile@latest
5353

5454
- name: gomobile init
5555
run: gomobile init
5656

57+
- name: install bind
58+
run: go install golang.org/x/mobile/cmd/gobind@latest
59+
5760
- name: android compile
5861
run: make android
5962

@@ -68,13 +71,12 @@ jobs:
6871
runs-on: ubuntu-latest
6972
steps:
7073
- name: git checkout
71-
uses: actions/checkout@v2
72-
73-
- name: Fetch all history for linter
74-
run: git fetch --prune --unshallow
74+
uses: actions/checkout@v3
75+
with:
76+
fetch-depth: 0
7577

7678
- name: go cache
77-
uses: actions/cache@v1
79+
uses: actions/cache@v3
7880
with:
7981
path: /home/runner/work/go
8082
key: lnc-${{ runner.os }}-go-${{ env.GO_VERSION }}-${{ github.job }}-${{ hashFiles('**/go.sum') }}
@@ -107,10 +109,10 @@ jobs:
107109
- unit-race
108110
steps:
109111
- name: git checkout
110-
uses: actions/checkout@v2
112+
uses: actions/checkout@v3
111113

112114
- name: go cache
113-
uses: actions/cache@v1
115+
uses: actions/cache@v3
114116
with:
115117
path: /home/runner/work/go
116118
key: lnc-${{ runner.os }}-go-${{ env.GO_VERSION }}-${{ github.job }}-${{ hashFiles('**/go.sum') }}
@@ -136,10 +138,10 @@ jobs:
136138
runs-on: ubuntu-latest
137139
steps:
138140
- name: git checkout
139-
uses: actions/checkout@v2
141+
uses: actions/checkout@v3
140142

141143
- name: go cache
142-
uses: actions/cache@v1
144+
uses: actions/cache@v3
143145
with:
144146
path: /home/runner/work/go
145147
key: lnc-${{ runner.os }}-go-${{ env.GO_VERSION }}-${{ github.job }}-${{ hashFiles('**/go.sum') }}

‎.golangci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,7 @@ linters:
4141

4242
# Gosec is outdated and reports false positives.
4343
- gosec
44+
45+
issues:
46+
# Only show newly introduced problems.
47+
new-from-rev: 4008b92d81d4d62e663025c5f79ebe44b53f283c

‎Dockerfile-wasm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#Get golang 1.19.2-buster as a base image
2-
FROM golang:1.19.2-buster as builder
1+
#Get golang 1.19 as a base image
2+
FROM golang:1.19 as builder
33

44
#Define the working directory in the container
55
WORKDIR /app

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ macos:
9999
android:
100100
@$(call print, "Building Android library ($(ANDROID_BUILD)).")
101101
mkdir -p $(ANDROID_BUILD_DIR)
102-
GOOS=js $(GOMOBILE_BIN) bind -target=android -tags="mobile $(DEV_TAGS) $(RPC_TAGS)" -androidapi 21 $(LDFLAGS_MOBILE) -v -o $(ANDROID_BUILD) $(MOBILE_PKG)
102+
cd mobile; GOOS=js $(GOMOBILE_BIN) bind -target=android -tags="mobile $(DEV_TAGS) $(RPC_TAGS)" -androidapi 21 $(LDFLAGS_MOBILE) -v -o $(ANDROID_BUILD) $(MOBILE_PKG)
103103

104104
mobile: ios android
105105

‎mailbox/create_conn.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ func NewClientWebsocketConn(mailboxServer, pairingPhrase string,
1818
func() (*grpc.ClientConn, error), error) {
1919

2020
words := strings.Split(pairingPhrase, " ")
21+
2122
var mnemonicWords [NumPassphraseWords]string
2223
copy(mnemonicWords[:], words)
2324
entropy := PassphraseMnemonicToEntropy(mnemonicWords)

‎mobile/go.mod‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ require (
9191
github.com/lightningnetwork/lnd/queue v1.1.0 // indirect
9292
github.com/lightningnetwork/lnd/ticker v1.1.0 // indirect
9393
github.com/lightningnetwork/lnd/tlv v1.0.3 // indirect
94-
github.com/lightningnetwork/lnd/tor v1.1.0 // indirect
94+
github.com/lightningnetwork/lnd/tor v1.0.2 // indirect
9595
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
9696
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
9797
github.com/mholt/archiver/v3 v3.5.0 // indirect
@@ -140,15 +140,12 @@ require (
140140
go.uber.org/multierr v1.6.0 // indirect
141141
go.uber.org/zap v1.17.0 // indirect
142142
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
143-
golang.org/x/mobile v0.0.0-20221110043201-43a038452099 // indirect
144-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
145143
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
146144
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
147145
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
148146
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
149147
golang.org/x/text v0.4.0 // indirect
150148
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
151-
golang.org/x/tools v0.1.12 // indirect
152149
google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced // indirect
153150
google.golang.org/protobuf v1.27.1 // indirect
154151
gopkg.in/errgo.v1 v1.0.1 // indirect

‎mobile/go.sum‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -585,8 +585,8 @@ github.com/lightningnetwork/lnd/tlv v1.0.3 h1:0xBZcPuXagP6f7TY/RnLNR4igE21ov6qUd
585585
github.com/lightningnetwork/lnd/tlv v1.0.3/go.mod h1:dzR/aZetBri+ZY/fHbwV06fNn/3UID6htQzbHfREFdo=
586586
github.com/lightningnetwork/lnd/tor v1.0.0/go.mod h1:RDtaAdwfAm+ONuPYwUhNIH1RAvKPv+75lHPOegUcz64=
587587
github.com/lightningnetwork/lnd/tor v1.0.1/go.mod h1:RDtaAdwfAm+ONuPYwUhNIH1RAvKPv+75lHPOegUcz64=
588-
github.com/lightningnetwork/lnd/tor v1.1.0 h1:iXO7fSzjxTI+p88KmtpbuyuRJeNfgtpl9QeaAliILXE=
589-
github.com/lightningnetwork/lnd/tor v1.1.0/go.mod h1:RDtaAdwfAm+ONuPYwUhNIH1RAvKPv+75lHPOegUcz64=
588+
github.com/lightningnetwork/lnd/tor v1.0.2 h1:GlumRkKdzXCX0AIvIi2UXKpeY1Q4RT7Lz/CfGpKSLrU=
589+
github.com/lightningnetwork/lnd/tor v1.0.2/go.mod h1:RDtaAdwfAm+ONuPYwUhNIH1RAvKPv+75lHPOegUcz64=
590590
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 h1:sjOGyegMIhvgfq5oaue6Td+hxZuf3tDC8lAPrFldqFw=
591591
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796/go.mod h1:3p7ZTf9V1sNPI5H8P3NkTFF4LuwMdPl2DodF60qAKqY=
592592
github.com/ltcsuite/ltcutil v0.0.0-20181217130922-17f3b04680b6/go.mod h1:8Vg/LTOO0KYa/vlHWJ6XZAevPQThGH5sufO0Hrou/lA=
@@ -893,8 +893,6 @@ golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhp
893893
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
894894
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
895895
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
896-
golang.org/x/mobile v0.0.0-20221110043201-43a038452099 h1:aIu0lKmfdgtn2uTj7JI2oN4TUrQvgB+wzTPO23bCKt8=
897-
golang.org/x/mobile v0.0.0-20221110043201-43a038452099/go.mod h1:aAjjkJNdrh3PMckS4B10TGS2nag27cbKR1y2BpUxsiY=
898896
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
899897
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
900898
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
@@ -903,8 +901,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
903901
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
904902
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
905903
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
906-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
907-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
908904
golang.org/x/net v0.0.0-20150829230318-ea47fc708ee3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
909905
golang.org/x/net v0.0.0-20180406214816-61147c48b25b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
910906
golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1119,7 +1115,6 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
11191115
golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
11201116
golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
11211117
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
1122-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
11231118
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
11241119
golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
11251120
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

0 commit comments

Comments
 (0)