From d920924b77c9ef678432b42ab51fc1d7cc77e2e0 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Tue, 29 Oct 2024 15:41:44 +0100 Subject: [PATCH 1/2] Fix zenoh-dissector syncing --- .github/workflows/sync-lockfiles.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync-lockfiles.yml b/.github/workflows/sync-lockfiles.yml index f9c473e..039a54c 100644 --- a/.github/workflows/sync-lockfiles.yml +++ b/.github/workflows/sync-lockfiles.yml @@ -62,8 +62,8 @@ jobs: - eclipse-zenoh/zenoh-backend-influxdb - eclipse-zenoh/zenoh-backend-rocksdb - eclipse-zenoh/zenoh-backend-s3 - - ZettaScaleLabs/zenoh-dissector - eclipse-zenoh/zenoh-ts + - eclipse-zenoh/zenoh-dissector steps: - name: Checkout ${{ matrix.dependant }} uses: actions/checkout@v4 @@ -117,6 +117,7 @@ jobs: cargo clippy --manifest-path build-resources/opaque-types/Cargo.toml --all-targets --features $features -- --deny warnings - name: cargo update ${{ matrix.dependant }} + if: ${{ matrix.dependant != 'eclipse-zenoh/zenoh-dissector' }} run: cargo update zenoh --manifest-path ${{ steps.crate-path.outputs.value }}/Cargo.toml - name: cargo update for zenoh-c build-resources From 9bc8714a235ad830ba1731a7fbd60e24e843e61b Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Tue, 29 Oct 2024 15:47:45 +0100 Subject: [PATCH 2/2] Install zenoh-dissector build dependencies --- .github/workflows/sync-lockfiles.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/sync-lockfiles.yml b/.github/workflows/sync-lockfiles.yml index 039a54c..ef24b44 100644 --- a/.github/workflows/sync-lockfiles.yml +++ b/.github/workflows/sync-lockfiles.yml @@ -81,6 +81,14 @@ jobs: - name: Install build dependencies run: sudo apt-get install -y llvm-dev libclang-dev clang libacl1-dev + - name: Install build dependencies (zenoh-dissector) + if: ${{ matrix.dependant == 'eclipse-zenoh/zenoh-dissector' }} + run: | + sudo apt install -y software-properties-common + sudo add-apt-repository -y ppa:wireshark-dev/stable + sudo apt install -y wireshark-dev + sudo apt install -y --allow-change-held-packages wireshark + # NOTE: Not all Zenoh dependants have their Cargo manifest and lockfile # at the repository's toplevel. The only exception being zenoh-kotlin and # zenoh-java. Thus the need for this ugly workaround.