From 20e893622e08a4b39523ba5f44f28a7687f0f499 Mon Sep 17 00:00:00 2001 From: maximiliantoe Date: Wed, 26 Mar 2025 21:26:32 +0100 Subject: [PATCH 1/7] updated signature to be compatible with latest up-cpp version --- pubsub/src/UTransportDomainSockets.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubsub/src/UTransportDomainSockets.h b/pubsub/src/UTransportDomainSockets.h index eee63ce..c9dfec9 100644 --- a/pubsub/src/UTransportDomainSockets.h +++ b/pubsub/src/UTransportDomainSockets.h @@ -42,7 +42,7 @@ class UTransportDomainSockets : public transport::UTransport { void notifyListener(const v1::UMessage& message); void listenThread(); // listen for incoming messages (thread) - void cleanupListener(CallableConn listener) override {} + void cleanupListener(const CallableConn& listener) override {} }; // class UTransportDomainSockets #endif // UTRANSPORT_DOMAIN_SOCKETS_H \ No newline at end of file From d5ca7473ac4c230d0c64c2bccd9878471dd82617 Mon Sep 17 00:00:00 2001 From: maximiliantoe Date: Fri, 28 Mar 2025 21:59:45 +0100 Subject: [PATCH 2/7] updated conanfile.txt to use up-core-api/1.6.0-alpha4 due to changed version number --- conanfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.txt b/conanfile.txt index ec056ee..c78bf93 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,7 +1,7 @@ [requires] up-cpp/[^1.0.1, include_prerelease] spdlog/[~1.13] -up-core-api/1.6.0 +up-core-api/1.6.0-alpha4 protobuf/[>=3.21.12] up-transport-socket-cpp/[>=1.0.0, include_prerelease] From 1ff986d42177074232ceb2868624a4dc56cb164f Mon Sep 17 00:00:00 2001 From: maximiliantoe Date: Fri, 28 Mar 2025 22:03:02 +0100 Subject: [PATCH 3/7] updated ci.yml to also use up-core-api/1.6.0-alpha4 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 493b42b..7d780ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: - name: Build up-core-api conan recipe shell: bash run: | - conan create --version 1.6.0 up-conan-recipes/up-core-api/release + conan create --version 1.6.0-alpha4 up-conan-recipes/up-core-api/release - name: Build up-cpp conan recipe shell: bash From 5bad0f0d0c81d4ff2a38d5dcc7ea62ed3448b81f Mon Sep 17 00:00:00 2001 From: maximiliantoe Date: Fri, 28 Mar 2025 22:33:19 +0100 Subject: [PATCH 4/7] added build=missing to ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d780ae..0c2c7b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: - name: Build up-core-api conan recipe shell: bash run: | - conan create --version 1.6.0-alpha4 up-conan-recipes/up-core-api/release + conan create --version 1.6.0-alpha4 --build=missing up-conan-recipes/up-core-api/release - name: Build up-cpp conan recipe shell: bash From dd968242df6d8ffa1a2131c98d0c8d42255f649b Mon Sep 17 00:00:00 2001 From: maximiliantoe Date: Fri, 28 Mar 2025 23:15:14 +0100 Subject: [PATCH 5/7] changed up-core-api version --- conanfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.txt b/conanfile.txt index c78bf93..1fcaa20 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,7 +1,7 @@ [requires] up-cpp/[^1.0.1, include_prerelease] spdlog/[~1.13] -up-core-api/1.6.0-alpha4 +up-core-api/[^1.6, include_prerelease] protobuf/[>=3.21.12] up-transport-socket-cpp/[>=1.0.0, include_prerelease] From a7d6951b7176881d538686123f3b3bcf2153a6b7 Mon Sep 17 00:00:00 2001 From: maximiliantoe Date: Sat, 29 Mar 2025 00:08:06 +0100 Subject: [PATCH 6/7] fixed repository checkout in CI --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c2c7b3..7ae4b39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,6 @@ jobs: uses: actions/checkout@v4 with: path: up-zenoh-example-cpp - repository: eclipse-uprotocol/up-zenoh-example-cpp - name: Fetch up-cpp conan recipe uses: actions/checkout@v4 From 322a2b75bbaa4fba6af34f4844d2685ec4e46941 Mon Sep 17 00:00:00 2001 From: maximiliantoe Date: Sat, 29 Mar 2025 00:17:37 +0100 Subject: [PATCH 7/7] pinned up-core-api version to 1.6.0-alpha4 --- conanfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.txt b/conanfile.txt index 1fcaa20..c78bf93 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,7 +1,7 @@ [requires] up-cpp/[^1.0.1, include_prerelease] spdlog/[~1.13] -up-core-api/[^1.6, include_prerelease] +up-core-api/1.6.0-alpha4 protobuf/[>=3.21.12] up-transport-socket-cpp/[>=1.0.0, include_prerelease]