Merge pull request #404 from ZettaScaleLabs/ctr_api_rework

API rework

.github/workflows/build-check.yaml

@@ -54,6 +54,18 @@ jobs:
           sudo apt install -y ninja-build
           FORCE_C99=ON CMAKE_GENERATOR=Ninja make
 
+  raweth_build:
+    name: Build raweth transport on ubuntu-latest
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Build raweth
+        run: |
+          sudo apt install -y ninja-build
+          Z_FEATURE_RAWETH_TRANSPORT=1 CMAKE_GENERATOR=Ninja make
+
   zenoh_build:
     name: Build Zenoh from source
     runs-on: ubuntu-latest
@@ -103,7 +115,7 @@ jobs:
         run: |
           sudo apt install -y ninja-build
           CMAKE_GENERATOR=Ninja make
-          python3 ./build/tests/modularity.py --pub $Z_FEATURE_PUBLICATION --sub $Z_FEATURE_SUBSCRIPTION --queryable $Z_FEATURE_QUERYABLE --query $Z_FEATURE_QUERY --attachment 1
+          python3 ./build/tests/modularity.py --pub $Z_FEATURE_PUBLICATION --sub $Z_FEATURE_SUBSCRIPTION --queryable $Z_FEATURE_QUERYABLE --query $Z_FEATURE_QUERY --attachment 0
         timeout-minutes: 5
         env:
           Z_FEATURE_PUBLICATION: ${{ matrix.feature_publication }}
@@ -115,25 +127,6 @@ jobs:
         if: always()
         run: kill ${{ steps.run-zenoh.outputs.zenohd-pid }}
 
-  raweth_build:
-    name: Build and test raweth transport on ubuntu-latest
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        feature_reth: [1, 0]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Build project and run test
-        run: |
-          sudo apt install -y ninja-build
-          CMAKE_GENERATOR=Ninja make
-          python3 ./build/tests/raweth.py --reth $Z_FEATURE_RAWETH_TRANSPORT
-        timeout-minutes: 5
-        env:
-          Z_FEATURE_RAWETH_TRANSPORT: ${{ matrix.feature_reth }}
-
   st_build:
     needs: zenoh_build
     name: Build and test in single thread on ubuntu-latest

CMakeLists.txt

@@ -132,8 +132,8 @@ 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_RAWETH_TRANSPORT 0 CACHE STRING "Toggle raw ethernet transport feature")
-set(Z_FEATURE_ATTACHMENT 1 CACHE STRING "Toggle attachment feature")
-set(Z_FEATURE_INTEREST 1 CACHE STRING "Toggle interest feature")
+set(Z_FEATURE_ATTACHMENT 0 CACHE STRING "Toggle attachment feature")
+set(Z_FEATURE_INTEREST 0 CACHE STRING "Toggle interest feature") # Toggle to 1 when protocol changes are merged
 add_definition(Z_FEATURE_MULTI_THREAD=${Z_FEATURE_MULTI_THREAD})
 add_definition(Z_FEATURE_PUBLICATION=${Z_FEATURE_PUBLICATION})
 add_definition(Z_FEATURE_SUBSCRIPTION=${Z_FEATURE_SUBSCRIPTION})

GNUmakefile

@@ -56,7 +56,7 @@ Z_FEATURE_PUBLICATION?=1
 Z_FEATURE_SUBSCRIPTION?=1
 Z_FEATURE_QUERY?=1
 Z_FEATURE_QUERYABLE?=1
-Z_FEATURE_ATTACHMENT?=1
+Z_FEATURE_ATTACHMENT?=0
 Z_FEATURE_INTEREST?=1
 Z_FEATURE_RAWETH_TRANSPORT?=0