From fd9fc8eb13898295a98ab6e225e3efbfc287e7d0 Mon Sep 17 00:00:00 2001 From: MarioIvancik Date: Tue, 25 Nov 2025 12:53:03 +0100 Subject: [PATCH 1/2] change async execution versions --- .../async-function-execution_debug.json | 7 +++---- .../async-function-execution_release.json | 7 +++---- package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json | 6 ++++-- package/fleet-protocol-cpp/fleet_protocol_cpp_release.json | 6 ++++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/package/async-function-execution/async-function-execution_debug.json b/package/async-function-execution/async-function-execution_debug.json index b4f8a38..bb2343f 100644 --- a/package/async-function-execution/async-function-execution_debug.json +++ b/package/async-function-execution/async-function-execution_debug.json @@ -1,12 +1,11 @@ { "Env": {}, "DependsOn": [ - "aeron", - "nlohmann-json" + "aeron" ], "Git": { "URI": "https://github.com/bringauto/async-function-execution.git", - "Revision": "v0.1.0" + "Revision": "v1.0.0" }, "Build": { "CMake": { @@ -22,7 +21,7 @@ }, "Package": { "Name": "async-function-execution", - "VersionTag": "v0.1.0", + "VersionTag": "v1.0.0", "PlatformString": { "Mode": "auto" }, diff --git a/package/async-function-execution/async-function-execution_release.json b/package/async-function-execution/async-function-execution_release.json index dd765fd..98c1b1b 100644 --- a/package/async-function-execution/async-function-execution_release.json +++ b/package/async-function-execution/async-function-execution_release.json @@ -1,12 +1,11 @@ { "Env": {}, "DependsOn": [ - "aeron", - "nlohmann-json" + "aeron" ], "Git": { "URI": "https://github.com/bringauto/async-function-execution.git", - "Revision": "v0.1.0" + "Revision": "v1.0.0" }, "Build": { "CMake": { @@ -22,7 +21,7 @@ }, "Package": { "Name": "async-function-execution", - "VersionTag": "v0.1.0", + "VersionTag": "v1.0.0", "PlatformString": { "Mode": "auto" }, diff --git a/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json b/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json index a164d91..4c88e2b 100644 --- a/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json +++ b/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json @@ -1,11 +1,13 @@ { "Env": {}, "DependsOn": [ + "aeron", + "async-function-execution", "fleet-protocol-interface" ], "Git": { "URI": "https://github.com/bringauto/fleet-protocol-cpp.git", - "Revision": "v1.1.1" + "Revision": "v1.2.0" }, "Build": { "CMake": { @@ -20,7 +22,7 @@ }, "Package": { "Name": "fleet-protocol-cpp", - "VersionTag": "v1.1.1", + "VersionTag": "v1.2.0", "PlatformString": { "Mode": "auto" }, diff --git a/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json b/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json index e28debe..9ac727d 100644 --- a/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json +++ b/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json @@ -1,11 +1,13 @@ { "Env": {}, "DependsOn": [ + "aeron", + "async-function-execution", "fleet-protocol-interface" ], "Git": { "URI": "https://github.com/bringauto/fleet-protocol-cpp.git", - "Revision": "v1.1.1" + "Revision": "v1.2.0" }, "Build": { "CMake": { @@ -20,7 +22,7 @@ }, "Package": { "Name": "fleet-protocol-cpp", - "VersionTag": "v1.1.1", + "VersionTag": "v1.2.0", "PlatformString": { "Mode": "auto" }, From 6309e3435e4305ad1b478369b302e0e7b999c848 Mon Sep 17 00:00:00 2001 From: MarioIvancik Date: Fri, 13 Feb 2026 09:40:32 +0100 Subject: [PATCH 2/2] temporary cmake fix for fleet os --- docker/fleet-os-3/Dockerfile | 5 ++++- package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json | 2 +- package/fleet-protocol-cpp/fleet_protocol_cpp_release.json | 2 +- package/fleet-protocol-interface/fleet_protocol_debug.json | 1 + package/fleet-protocol-interface/fleet_protocol_release.json | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docker/fleet-os-3/Dockerfile b/docker/fleet-os-3/Dockerfile index 5000b92..bac7ea2 100644 --- a/docker/fleet-os-3/Dockerfile +++ b/docker/fleet-os-3/Dockerfile @@ -29,7 +29,7 @@ ENV LANG=en_US.UTF-8 ENV LANGUAGE=en_US:en ENV LC_ALL=en_US.UTF-8 -# Do we need it? It should be part of the toolchain +# Toolchain installs version 3.28 but aeron requires > 3.30 RUN wget "https://github.com/Kitware/CMake/releases/download/v3.31.8/cmake-3.31.8-linux-x86_64.sh" -O cmake.sh && \ chmod +x cmake.sh && \ ./cmake.sh --skip-license --prefix=/usr/local && \ @@ -61,4 +61,7 @@ RUN apt-get update && \ wget unzip && \ rm -rf /var/lib/apt/lists/* +# Temporary until toolchain cmake is version > 3.30 +RUN echo "alias cmake='/usr/local/bin/cmake'" >> /root/.bashrc + ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"] diff --git a/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json b/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json index 4c88e2b..933a300 100644 --- a/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json +++ b/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json @@ -35,7 +35,7 @@ "ubuntu2204", "debian12", "ubuntu2404", - "fedora40", + "ubuntu2504", "fleet-os-3", "fedora41", "fedora42" diff --git a/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json b/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json index 9ac727d..4a0e53e 100644 --- a/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json +++ b/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json @@ -35,7 +35,7 @@ "ubuntu2204", "debian12", "ubuntu2404", - "fedora40", + "ubuntu2504", "fleet-os-3", "fedora41", "fedora42" diff --git a/package/fleet-protocol-interface/fleet_protocol_debug.json b/package/fleet-protocol-interface/fleet_protocol_debug.json index 89a7636..bf0a887 100644 --- a/package/fleet-protocol-interface/fleet_protocol_debug.json +++ b/package/fleet-protocol-interface/fleet_protocol_debug.json @@ -32,6 +32,7 @@ "debian12", "ubuntu1804-aarch64", "ubuntu2404", + "ubuntu2504", "fedora40", "fleet-os-3", "fedora41", diff --git a/package/fleet-protocol-interface/fleet_protocol_release.json b/package/fleet-protocol-interface/fleet_protocol_release.json index 5c98e14..d9abb3c 100644 --- a/package/fleet-protocol-interface/fleet_protocol_release.json +++ b/package/fleet-protocol-interface/fleet_protocol_release.json @@ -32,6 +32,7 @@ "debian12", "ubuntu1804-aarch64", "ubuntu2404", + "ubuntu2504", "fedora40", "fleet-os-3", "fedora41",