From 8e703f916b7a7135023990921f82eeceb417d953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Thu, 29 Aug 2019 20:57:32 +0200
Subject: [PATCH 1/3] Docker: Eclair: Upgrade openjdk from 8 to 11

---
 Dockerfile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8264d6c..1c6d459 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ RUN apt-get update \
     libzmq3-dev \
     miniupnpc \
     net-tools \
-    openjdk-8-jdk \
+    openjdk-11-jdk \
     pkg-config \
     python \
     python3 \
@@ -59,6 +59,7 @@ RUN cd /tmp \
     && cp bitcoin-$BITCOIN_VERSION/bin/bitcoin* /usr/bin/ \
     && rm -rf $BITCOIN_TARBALL bitcoin-$BITCOIN_VERSION
 
+# maven for java builds (eclair)
 RUN cd /tmp \
     && wget -qO mvn.tar.gz https://www-us.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz \
     && tar -xzf mvn.tar.gz \
@@ -75,9 +76,6 @@ RUN cd /tmp \
 
 ENV GOROOT=/usr/local/go
 
-# eclair
-RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
-
 VOLUME /root/lightning-integration/reports
 VOLUME /root/lightning-integration/output
 

From 5bf3d1ec54c68f0cc1f379bbf737eb6d6f71533b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Thu, 29 Aug 2019 16:07:19 +0200
Subject: [PATCH 2/3] Makefile: Separate update targets

---
 Makefile | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index be515c8..8a95892 100644
--- a/Makefile
+++ b/Makefile
@@ -18,14 +18,24 @@ src/lnd:
 src/ptarmigan:
 	git clone https://github.com/nayutaco/ptarmigan.git src/ptarmigan
 
-update: src/eclair src/lightning src/lnd src/ptarmigan
-	rm src/eclair/version src/lightning/version src/lnd/version src/ptarmigan/version || true
-
+update-eclair: src/eclair
+	rm src/eclair/version || true
 	cd src/eclair && git stash; git pull origin master
+
+update-clightning: src/lightning
+	rm src/lightning/version || true
 	cd src/lightning && git stash; git pull origin master
+
+update-lnd: src/lnd
+	rm src/lnd/version || true
 	cd src/lnd && git stash; git pull origin master
+
+update-ptarmigan: src/ptarmigan
+	rm src/ptarmigan/version || true
 	cd src/ptarmigan && git stash; git pull origin master
 
+update: update-eclair update-clightning update-lnd update-ptarmigan
+
 bin/eclair.jar: src/eclair
 	(cd src/eclair; git rev-parse HEAD) > src/eclair/version
 	(cd src/eclair/; mvn package -Dmaven.test.skip=true || true)

From cf76ac804f645aa0548bdd0b5f8a80813c42a799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Thu, 29 Aug 2019 15:52:26 +0200
Subject: [PATCH 3/3] Travis: Build clients independently in build matrix and
 run the tests that can be run

plus use makefile from travis for install
---
 .travis.yml | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 09289d5..d1c0252 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,28 @@
 language: bash
 services: docker
 
-build:
-  - docker build -t lnintegration .
+install:
+  - make docker-build
 
 after_success:
   # Log that the build worked, because we all need some good news
   - echo "Success running lightning-integration"
+
+jobs:
+  include:
+
+    - name: 'Build eclair'
+      script:
+        - docker run lnintegration bash -c "make update-eclair bin/eclair.jar && py.test -v test.py -k EclairNode"
+
+    - name: 'Build clightning'
+      script:
+        - docker run lnintegration bash -c "make update-clightning bin/lightningd && py.test -v test.py -k LightningNode"
+
+    - name: 'Build lnd'
+      script:
+        - docker run lnintegration bash -c "make update-lnd bin/lnd && py.test -v test.py -k LndNode"
+
+    - name: 'Build ptarmigan'
+      script:
+        - docker run lnintegration bash -c "make update-ptarmigan bin/ptarmd && py.test -v test.py -k PtarmNode"