From bbb78fe5a40173abd84e126b633e4c36219c1c60 Mon Sep 17 00:00:00 2001
From: Luca Cominardi <luca.cominardi@gmail.com>
Date: Tue, 5 Jan 2021 15:33:46 +0100
Subject: [PATCH] Integration test is done with Zenoh-rust master branch

---
 .github/workflows/integration.yaml |  7 +++++++
 tests/routed.sh                    | 31 +++++++-----------------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 7b11debd1..cc019d6a1 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -27,6 +27,13 @@ jobs:
     steps:
     - uses: actions/checkout@v2     
       
+    - name: Install latest nightly
+      uses: actions-rs/toolchain@v1
+      with:
+          toolchain: nightly
+          override: true
+          components: rustfmt, clippy
+
     - name: Compile release
       run: make all
       env:
diff --git a/tests/routed.sh b/tests/routed.sh
index c74c087e3..2193529f4 100644
--- a/tests/routed.sh
+++ b/tests/routed.sh
@@ -14,37 +14,20 @@
 #
 
 TESTBIN=$1
+TESTDIR=$(dirname $0)
 
-cd $(dirname $0)
+cd $TESTDIR
 
 echo "------------------ Running test $TESTBIN -------------------"
 
 sleep 5
 
 if [ ! -f zenohd ]; then
-    VERSION=$(curl --silent "https://api.github.com/repos/eclipse-zenoh/zenoh/releases" | grep '"name"' | head -n1 | cut -d'"' -f4 | cut -d"v" -f2)
-    if [ -z "$VERSION" ]; then
-        echo "Unable to retrieve zenoh version ..."
-        exit -1
-    fi
-
-    echo "> Target zenoh version $VERSION ..."
-    LINK=""
-    case "$OSTYPE" in
-    "darwin"*)
-        LINK="https://download.eclipse.org/zenoh/zenoh/master/eclipse-zenoh-$VERSION-macosx10.7-x86-64.tgz"
-    ;;
-    "linux-gnu"*) 
-        LINK="https://download.eclipse.org/zenoh/zenoh/master/eclipse-zenoh-$VERSION-x86_64-unknown-linux-gnu.tgz"
-    ;;
-    *) 
-       exit -1
-    ;;
-    esac
-
-    echo "> Downloading $LINK ..."
-    curl --location --progress-bar --output zenohd.tar.gz $LINK
-    tar -xzf zenohd.tar.gz
+    git clone https://github.com/eclipse-zenoh/zenoh.git zenoh-git
+    cd zenoh-git
+    cargo build
+    cp ./target/debug/zenohd $TESTDIR/
+    cd $TESTDIR
 fi
 
 chmod +x zenohd