From 186e9c145e649e6fe7d03711834013c1e479e450 Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Tue, 10 Dec 2024 13:11:53 +0100 Subject: [PATCH 1/3] stabilize liveliness API --- CMakeLists.txt | 8 +------- zenohpico.pc | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4320a36a..59d5e593f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,7 +221,7 @@ set(Z_FEATURE_PUBLICATION 1 CACHE STRING "Toggle publication feature") set(Z_FEATURE_SUBSCRIPTION 1 CACHE STRING "Toggle subscription feature") set(Z_FEATURE_QUERY 1 CACHE STRING "Toggle query feature") set(Z_FEATURE_QUERYABLE 1 CACHE STRING "Toggle queryable feature") -set(Z_FEATURE_LIVELINESS 0 CACHE STRING "Toggle liveliness feature") +set(Z_FEATURE_LIVELINESS 1 CACHE STRING "Toggle liveliness feature") set(Z_FEATURE_INTEREST 1 CACHE STRING "Toggle interests") set(Z_FEATURE_FRAGMENTATION 1 CACHE STRING "Toggle fragmentation") set(Z_FEATURE_ENCODING_VALUES 1 CACHE STRING "Toggle encoding values") @@ -245,12 +245,6 @@ set(Z_FEATURE_PUBLISHER_SESSION_CHECK 1 CACHE STRING "Toggle publisher session c set(Z_FEATURE_BATCHING 1 CACHE STRING "Toggle batching") set(Z_FEATURE_RX_CACHE 0 CACHE STRING "Toggle RX_CACHE") -# Add a warning message if someone tries to enable Z_FEATURE_LIVELINESS directly -if(Z_FEATURE_LIVELINESS AND NOT Z_FEATURE_UNSTABLE_API) - message(WARNING "Z_FEATURE_LIVELINESS can only be enabled when Z_FEATURE_UNSTABLE_API is also enabled. Disabling Z_FEATURE_LIVELINESS.") - set(Z_FEATURE_LIVELINESS 0 CACHE STRING "Toggle liveliness feature" FORCE) -endif() - # Add a warning message if someone tries to enable Z_FEATURE_LINK_SERIAL_USB directly if(Z_FEATURE_LINK_SERIAL_USB AND NOT Z_FEATURE_UNSTABLE_API) message(WARNING "Z_FEATURE_LINK_SERIAL_USB can only be enabled when Z_FEATURE_UNSTABLE_API is also enabled. Disabling Z_FEATURE_LINK_SERIAL_USB.") diff --git a/zenohpico.pc b/zenohpico.pc index 1e3b39ae2..421fe0950 100644 --- a/zenohpico.pc +++ b/zenohpico.pc @@ -3,6 +3,6 @@ prefix=/usr/local Name: zenohpico Description: URL: -Version: 1.0.20241018dev +Version: 1.0.20241210dev Cflags: -I${prefix}/include Libs: -L${prefix}/lib -lzenohpico From f8de811928ca2868c5d9a0b43efb662d282fa26e Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Tue, 10 Dec 2024 23:32:40 +0100 Subject: [PATCH 2/3] refeence liveliznes_stabilize cpp branch --- .github/workflows/cpp-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cpp-check.yaml b/.github/workflows/cpp-check.yaml index 1e5a57e41..29e09ea20 100644 --- a/.github/workflows/cpp-check.yaml +++ b/.github/workflows/cpp-check.yaml @@ -25,7 +25,7 @@ on: zenoh_cpp_branch: description: 'Branch of zenoh-cpp to use' required: false - default: 'main' + default: 'liveliness_stabilize' jobs: build-and-test: @@ -52,7 +52,7 @@ jobs: git clone https://github.com/eclipse-zenoh/zenoh-cpp.git cd zenoh-cpp git fetch --all - git checkout ${{ github.event.inputs.zenoh_cpp_branch || 'main' }} + git checkout ${{ github.event.inputs.zenoh_cpp_branch || 'liveliness_stabilize' }} git submodule update --init --recursive - name: build zenoh-cpp From 252e99dcb145586badc6f7675b11350a8a513b0d Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Wed, 11 Dec 2024 13:16:44 +0100 Subject: [PATCH 3/3] restored main in CI cpp check --- .github/workflows/cpp-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cpp-check.yaml b/.github/workflows/cpp-check.yaml index 29e09ea20..1e5a57e41 100644 --- a/.github/workflows/cpp-check.yaml +++ b/.github/workflows/cpp-check.yaml @@ -25,7 +25,7 @@ on: zenoh_cpp_branch: description: 'Branch of zenoh-cpp to use' required: false - default: 'liveliness_stabilize' + default: 'main' jobs: build-and-test: @@ -52,7 +52,7 @@ jobs: git clone https://github.com/eclipse-zenoh/zenoh-cpp.git cd zenoh-cpp git fetch --all - git checkout ${{ github.event.inputs.zenoh_cpp_branch || 'liveliness_stabilize' }} + git checkout ${{ github.event.inputs.zenoh_cpp_branch || 'main' }} git submodule update --init --recursive - name: build zenoh-cpp