Skip to content

fix zenoh-pico ci #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OlivierHecart merged 2 commits into from
Jul 23, 2025
Merged

fix zenoh-pico ci #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f34a6ea
fix ci to pass switches in upper-case
DenisBiryukov91 Jul 23, 2025
2f25435
remove source_infor from query/reply for zenoh-pico
DenisBiryukov91 Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
shm: [FALSE, TRUE]
unstable: [FALSE, TRUE]
shm: ["FALSE", "TRUE"]
unstable: ["FALSE", "TRUE"]
build_type: [Debug, Release]
exclude:
- os: windows-latest
build_type: Debug
shm: TRUE
shm: "TRUE"

steps:
- name: Clone this repository
Expand Down
9 changes: 5 additions & 4 deletions include/zenoh/api/querier.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#if (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_MATCHING == 1)
#include "matching.hxx"
#endif
#if defined(Z_FEATURE_UNSTABLE_API)
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
#include "source_info.hxx"
#endif
#include <optional>
Expand All @@ -48,10 +48,11 @@ class Querier : public Owned<::z_owned_querier_t> {
std::optional<Bytes> payload = {};
/// @brief An optional encoding of the query payload and/or attachment.
std::optional<Encoding> encoding = {};
#if defined(Z_FEATURE_UNSTABLE_API)
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future
/// release.
/// @brief The source info for the query.
/// @note Zenoh-c only.
std::optional<SourceInfo> source_info = {};
#endif

Expand Down Expand Up @@ -88,7 +89,7 @@ class Querier : public Owned<::z_owned_querier_t> {
z_querier_get_options_default(&opts);
opts.payload = interop::as_moved_c_ptr(options.payload);
opts.encoding = interop::as_moved_c_ptr(options.encoding);
#if defined(Z_FEATURE_UNSTABLE_API)
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
opts.source_info = interop::as_moved_c_ptr(options.source_info);
#endif
opts.attachment = interop::as_moved_c_ptr(options.attachment);
Expand Down Expand Up @@ -116,7 +117,7 @@ class Querier : public Owned<::z_owned_querier_t> {
z_querier_get_options_default(&opts);
opts.payload = interop::as_moved_c_ptr(options.payload);
opts.encoding = interop::as_moved_c_ptr(options.encoding);
#if defined(Z_FEATURE_UNSTABLE_API)
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
opts.source_info = interop::as_moved_c_ptr(options.source_info);
#endif
opts.attachment = interop::as_moved_c_ptr(options.attachment);
Expand Down
10 changes: 6 additions & 4 deletions include/zenoh/api/query.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "enums.hxx"
#include "interop.hxx"
#include "keyexpr.hxx"
#if defined(Z_FEATURE_UNSTABLE_API)
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
#include "source_info.hxx"
#endif
#include "timestamp.hxx"
Expand Down Expand Up @@ -115,10 +115,11 @@ class Query : public Owned<::z_owned_query_t> {
bool is_express = false;
/// @brief The timestamp of this message.
std::optional<Timestamp> timestamp = {};
#if defined(Z_FEATURE_UNSTABLE_API)
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future
/// release.
/// @brief The source info of this reply message.
/// @note Zenoh-c only.
std::optional<SourceInfo> source_info = {};
#endif
/// @brief An optional attachment to this reply message.
Expand Down Expand Up @@ -194,10 +195,11 @@ class Query : public Owned<::z_owned_query_t> {
bool is_express = false;
/// @brief the timestamp of this message.
std::optional<Timestamp> timestamp = {};
#if defined(Z_FEATURE_UNSTABLE_API)
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future
/// release.
/// @brief The source info of this reply message.
/// @note Zenoh-c only.
std::optional<SourceInfo> source_info = {};
#endif
/// @brief An optional attachment to this reply message.
Expand All @@ -222,7 +224,7 @@ class Query : public Owned<::z_owned_query_t> {
opts.congestion_control = options.congestion_control;
opts.is_express = options.is_express;
opts.timestamp = interop::as_copyable_c_ptr(options.timestamp);
#if defined(Z_FEATURE_UNSTABLE_API)
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
opts.source_info = interop::as_moved_c_ptr(options.source_info);
#endif
opts.attachment = interop::as_moved_c_ptr(options.attachment);
Expand Down
7 changes: 3 additions & 4 deletions include/zenoh/api/session.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,21 +184,20 @@ class Session : public Owned<::z_owned_session_t> {
std::optional<Bytes> payload = {};
/// @brief An optional encoding of the query payload and/or attachment.
std::optional<Encoding> encoding = {};
#if defined(Z_FEATURE_UNSTABLE_API)
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future
/// release.
/// @brief The source info for the query.
/// @note Zenoh-c only.
std::optional<SourceInfo> source_info = {};

#if defined(ZENOHCXX_ZENOHC)
/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future
/// release.
///
/// @brief The accepted replies for the query.
/// @note Zenoh-c only.
ReplyKeyExpr accept_replies = ::zc_reply_keyexpr_default();
#endif
#endif

#if defined(ZENOHCXX_ZENOHC)
/// @brief Allowed destination.
Expand Down Expand Up @@ -228,7 +227,7 @@ class Session : public Owned<::z_owned_session_t> {
opts.is_express = this->is_express;
opts.payload = interop::as_moved_c_ptr(this->payload);
opts.encoding = interop::as_moved_c_ptr(this->encoding);
#if defined(Z_FEATURE_UNSTABLE_API)
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
opts.source_info = interop::as_moved_c_ptr(this->source_info);
#endif
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
Expand Down
Loading