Skip to content

Commit 6d3cf8e

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

File tree

8 files changed

+26
-19
lines changed

8 files changed

+26
-19
lines changed

‎.github/workflows/main.yml

Lines changed: 11 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,7 +49,7 @@ 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
@@ -68,13 +68,12 @@ jobs:
6868
runs-on: ubuntu-latest
6969
steps:
7070
- name: git checkout
71-
uses: actions/checkout@v2
72-
73-
- name: Fetch all history for linter
74-
run: git fetch --prune --unshallow
71+
uses: actions/checkout@v3
72+
with:
73+
fetch-depth: 0
7574

7675
- name: go cache
77-
uses: actions/cache@v1
76+
uses: actions/cache@v3
7877
with:
7978
path: /home/runner/work/go
8079
key: lnc-${{ runner.os }}-go-${{ env.GO_VERSION }}-${{ github.job }}-${{ hashFiles('**/go.sum') }}
@@ -107,10 +106,10 @@ jobs:
107106
- unit-race
108107
steps:
109108
- name: git checkout
110-
uses: actions/checkout@v2
109+
uses: actions/checkout@v3
111110

112111
- name: go cache
113-
uses: actions/cache@v1
112+
uses: actions/cache@v3
114113
with:
115114
path: /home/runner/work/go
116115
key: lnc-${{ runner.os }}-go-${{ env.GO_VERSION }}-${{ github.job }}-${{ hashFiles('**/go.sum') }}
@@ -136,10 +135,10 @@ jobs:
136135
runs-on: ubuntu-latest
137136
steps:
138137
- name: git checkout
139-
uses: actions/checkout@v2
138+
uses: actions/checkout@v3
140139

141140
- name: go cache
142-
uses: actions/cache@v1
141+
uses: actions/cache@v3
143142
with:
144143
path: /home/runner/work/go
145144
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; go install golang.org/x/mobile/cmd/gobind@latest; 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/deps.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package mobile
2+
3+
import _ "golang.org/x/mobile/bind"

‎mobile/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ require (
77
github.com/lightninglabs/lightning-node-connect v0.2.1-alpha
88
github.com/lightninglabs/lightning-terminal v0.8.5-alpha
99
github.com/lightningnetwork/lnd v0.15.5-beta
10+
golang.org/x/mobile v0.0.0-20221110043201-43a038452099
1011
google.golang.org/grpc v1.51.0
1112
gopkg.in/macaroon-bakery.v2 v2.3.0
1213
gopkg.in/macaroon.v2 v2.1.0
@@ -91,7 +92,7 @@ require (
9192
github.com/lightningnetwork/lnd/queue v1.1.0 // indirect
9293
github.com/lightningnetwork/lnd/ticker v1.1.0 // indirect
9394
github.com/lightningnetwork/lnd/tlv v1.0.3 // indirect
94-
github.com/lightningnetwork/lnd/tor v1.1.0 // indirect
95+
github.com/lightningnetwork/lnd/tor v1.0.2 // indirect
9596
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
9697
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
9798
github.com/mholt/archiver/v3 v3.5.0 // indirect
@@ -140,7 +141,6 @@ require (
140141
go.uber.org/multierr v1.6.0 // indirect
141142
go.uber.org/zap v1.17.0 // indirect
142143
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
143-
golang.org/x/mobile v0.0.0-20221110043201-43a038452099 // indirect
144144
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
145145
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
146146
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect

‎mobile/go.sum

Lines changed: 2 additions & 2 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=

0 commit comments

Comments
 (0)