Skip to content

Commit 1100835

Browse files
committed
Travis: Makefile: Install rust-lightning-bitcoinrpc from source
1 parent 2e150fc commit 1100835

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@ jobs:
2626
- name: 'Build ptarmigan'
2727
script:
2828
- docker run lnintegration bash -c "make update-ptarmigan bin/ptarmd && py.test -v test.py -k PtarmNode"
29+
30+
- name: 'Build rust-lightning-bitcoinrpc'
31+
script:
32+
- docker run lnintegration bash -c "make update-rust-lightning bin/rust-lightning-bitcoinrpc"

Makefile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ src/lnd:
2525
src/ptarmigan:
2626
git clone https://github.com/nayutaco/ptarmigan.git src/ptarmigan
2727

28+
src/rust-lightning-bitcoinrpc:
29+
git clone https://github.com/jtimon/rust-lightning-bitcoinrpc.git src/rust-lightning-bitcoinrpc
30+
2831
update-eclair: src/eclair
2932
rm src/eclair/version || true
3033
cd src/eclair && git stash; git pull origin master
@@ -41,7 +44,10 @@ update-ptarmigan: src/ptarmigan
4144
rm src/ptarmigan/version || true
4245
cd src/ptarmigan && git stash; git pull origin master
4346

44-
update: update-eclair update-clightning update-lnd update-ptarmigan
47+
update-rust-lightning: src/rust-lightning-bitcoinrpc
48+
cd src/rust-lightning-bitcoinrpc && git stash; git checkout simpler-argman
49+
50+
update: update-eclair update-clightning update-lnd update-ptarmigan update-rust-lightning
4551

4652
bin/eclair.jar: src/eclair
4753
(cd src/eclair; git rev-parse HEAD) > src/eclair/version
@@ -70,14 +76,19 @@ bin/lnd: src/lnd
7076
&& go build -v -mod=vendor -o lncli github.com/lightningnetwork/lnd/cmd/lncli
7177
cp src/lnd/lnd src/lnd/lncli bin/
7278

79+
bin/rust-lightning-bitcoinrpc: src/rust-lightning-bitcoinrpc
80+
cd src/rust-lightning-bitcoinrpc; cargo build --release -j ${NPROC}
81+
cp src/rust-lightning-bitcoinrpc/target/release/rust-lightning-bitcoinrpc bin/
82+
7383
clean:
7484
rm src/lnd/version src/lightning/version src/eclair/version src/ptarmigan/version || true
7585
rm bin/* || true
7686
cd src/lightning; make clean
7787
cd src/eclair; mvn clean
7888
cd src/ptarmigan; make distclean
89+
cd src/rust-lightning-bitcoinrpc; cargo clean
7990

80-
clients: bin/lightningd bin/lnd bin/eclair.jar bin/ptarmd
91+
clients: bin/lightningd bin/lnd bin/eclair.jar bin/ptarmd bin/rust-lightning-bitcoinrpc
8192

8293
test: clients
8394
# Failure is always an option

0 commit comments

Comments
 (0)