From 38c03095241f10898c391368be18e14606671c39 Mon Sep 17 00:00:00 2001
From: OlivierHecart <olivier.hecart@adlinktech.com>
Date: Wed, 27 Mar 2024 16:41:22 +0100
Subject: [PATCH] Update other jobs

---
 .github/workflows/build-check.yaml | 45 ++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-check.yaml b/.github/workflows/build-check.yaml
index 0c1a2500f..1e2d7af1b 100644
--- a/.github/workflows/build-check.yaml
+++ b/.github/workflows/build-check.yaml
@@ -112,6 +112,7 @@ jobs:
           Z_FEATURE_QUERY: ${{ matrix.feature_query }}
 
       - name: Kill Zenoh router
+        if: always()
         run: kill ${{ steps.run-zenoh.outputs.zenohd-pid }}
 
   raweth_build:
@@ -134,14 +135,26 @@ jobs:
           Z_FEATURE_RAWETH_TRANSPORT: ${{ matrix.feature_reth }}
 
   st_build:
+    needs: zenoh_build
     name: Build and test in single thread on ubuntu-latest
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Run docker image
-        run: docker run --name zenoh_router --init --net host -d eclipse/zenoh:latest
+      - name: Download Zenoh artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ needs.zenoh_build.outputs.artifact-name }}
+
+      - name: Unzip Zenoh artifacts
+        run: unzip ${{ needs.zenoh_build.outputs.artifact-name }} -d zenoh-standalone
+
+      - id: run-zenoh
+        name: Run Zenoh router
+        run: |
+          RUST_LOG=debug ./zenoh-standalone/zenohd &
+          echo "zenohd-pid=$!" >> $GITHUB_OUTPUT
 
       - name: Build project and run test
         run: |
@@ -152,21 +165,31 @@ jobs:
         env:
           Z_FEATURE_MULTI_THREAD: 0
 
-      - name: Stop docker image
+      - name: Kill Zenoh router
         if: always()
-        run: |
-          docker stop zenoh_router
-          docker rm zenoh_router
+        run: kill ${{ steps.run-zenoh.outputs.zenohd-pid }}
 
   fragment_test:
+    needs: zenoh_build
     name: Test multicast and unicast fragmentation
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Run docker image
-        run: docker run --name zenoh_router --init --net host -d eclipse/zenoh:latest
+      - name: Download Zenoh artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ needs.zenoh_build.outputs.artifact-name }}
+
+      - name: Unzip Zenoh artifacts
+        run: unzip ${{ needs.zenoh_build.outputs.artifact-name }} -d zenoh-standalone
+
+      - id: run-zenoh
+        name: Run Zenoh router
+        run: |
+          RUST_LOG=debug ./zenoh-standalone/zenohd &
+          echo "zenohd-pid=$!" >> $GITHUB_OUTPUT
 
       - name: Build project and run test
         run: |
@@ -176,8 +199,6 @@ jobs:
           python3 ./build/tests/fragment.py
         timeout-minutes: 5
 
-      - name: Stop docker image
+      - name: Kill Zenoh router
         if: always()
-        run: |
-          docker stop zenoh_router
-          docker rm zenoh_router
+        run: kill ${{ steps.run-zenoh.outputs.zenohd-pid }}