Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
a452192
Update deps
Tobias-Fischer Nov 11, 2025
2caff31
Update dependencies in conda_build_config.yaml
Tobias-Fischer Nov 11, 2025
32fd104
Add existence post-install tests for desktop and turtlebot3
traversaro Nov 11, 2025
8fdf57a
Update package versions in conda_build_config.yaml
traversaro Nov 11, 2025
16a719e
Pin libxml2 to 2.13.*
traversaro Nov 11, 2025
8f25d62
Remove libxml2 from package list
traversaro Nov 11, 2025
feaa6a3
Enable full rebuild by setting IGNORE_CACHE to true
traversaro Nov 11, 2025
c8f1e14
Change full rebuild flag to false in workflow
traversaro Nov 11, 2025
c145103
Fix compilation with Boost 1.87
traversaro Nov 11, 2025
0cd8750
Update testpr.yml
traversaro Nov 11, 2025
bc37d04
Add tests for desktop-full and pcl-conversions
traversaro Nov 11, 2025
59345ef
Add missing dep to ros2 pkg tests
traversaro Nov 11, 2025
4ab9b4e
Merge branch 'main' into novrebuild
traversaro Nov 29, 2025
6069f0a
Remove build_number from pkg_additional_info.yaml
traversaro Nov 29, 2025
e040bb7
add patch
wep21 Nov 24, 2025
678b552
fmt v12
wep21 Nov 30, 2025
bb17036
full rebuild
wep21 Nov 30, 2025
7f5da0c
Add 'fmt' to spdlog dependencies in robostack.yaml as spdlog ABI depe…
traversaro Nov 30, 2025
a6d12f5
dummy
wep21 Dec 3, 2025
5425481
update vtk
wep21 Dec 3, 2025
c6c76d1
Change vinca dependency revision in pixi.toml
Tobias-Fischer Dec 8, 2025
c450ddf
Update vinca dependency to a new commit hash
Tobias-Fischer Dec 8, 2025
b96c092
fix osx-64 image
Tobias-Fischer Dec 9, 2025
039108f
Try tbb2022
Tobias-Fischer Dec 9, 2025
ab7bec8
Disable full rebuild by setting IGNORE_CACHE to false
traversaro Dec 11, 2025
1e54a27
Merge branch 'main' into decrebuild
Tobias-Fischer Dec 12, 2025
142a903
update snapshot
wep21 Jan 11, 2026
d969bd4
update patch
wep21 Jan 11, 2026
e849195
update
wep21 Jan 11, 2026
104ec3d
Merge branch 'main' into decrebuild
wep21 Jan 16, 2026
768c4e0
update foxglove hash
wep21 Jan 16, 2026
c63731c
ignore cache
wep21 Jan 16, 2026
3b10977
Add Lua version 5.4 to conda build configuration
Tobias-Fischer Jan 17, 2026
668399b
Fix mistake in foxglove bridge hash
gftabor Jan 18, 2026
11e35a3
Add ros-jazzy-hls-lfcd-lds-driver.patch
traversaro Jan 18, 2026
0eccba8
Disable full rebuild by setting cache ignore to false
traversaro Jan 18, 2026
ffe7a9f
Update dependencies in conda_build_config.yaml
traversaro Jan 18, 2026
95a0b92
Enable full rebuild by setting IGNORE_CACHE to true
traversaro Jan 18, 2026
a226729
Disable full rebuild by setting cache ignore to 'false'
traversaro Jan 19, 2026
960883b
Refine comments and update pinocchio version
traversaro Jan 19, 2026
4b44d92
Fix hpp-fcl version
traversaro Jan 19, 2026
6971a7a
Update usb-cam patch
traversaro Jan 19, 2026
7ac5966
Add missing dependency in turtlebot3 test
traversaro Jan 19, 2026
6df054a
Do not commit the .pixi folders
traversaro Jan 19, 2026
aeef077
Add backport for https://github.com/ament/ament_lint/pull/563
traversaro Jan 19, 2026
05a9ed5
Add pkgs requested in late 2025
traversaro Jan 19, 2026
97042f5
Create ros-jazzy-mavlink.osx.patch
traversaro Jan 19, 2026
715a3bb
Update testpr.yml
traversaro Jan 19, 2026
a4d2cce
Temporary delete mavlink
traversaro Jan 20, 2026
a1b53db
Fix temp hack for rebuilding mav
Tobias-Fischer Jan 20, 2026
18c2d6a
Update vinca.yaml
traversaro Jan 20, 2026
70166db
Update testpr.yml
traversaro Jan 20, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/testpr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
env:
ROS_VERSION: 2
# Change to 'true' to enable the cache upload as artifacts
SAVE_CACHE_AS_ARTIFACT: 'false'
SAVE_CACHE_AS_ARTIFACT: 'true'
# Change to 'true' to ignore cache and force a full rebuild, but please restore to 'false' before merging
IGNORE_CACHE_AND_DO_FULL_REBUILD: 'false'
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ recipes_only_patch/
*.json
.DS_Store
# pixi environments
.pixi
.pixi/*
*.egg-info
output/
34 changes: 20 additions & 14 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
numpy:
- 1.26
- 2
libprotobuf:
- 5.29.3
- 6.31.1
protobuf:
- 5.29.3
- 6.31.1
spdlog:
- 1.15
- 1.17
pugixml:
- '1.15'
libopencv:
- 4.11.0
- 4.12.0
libxml2:
- 2.13.*
- 2.14.*
graphviz:
- 13.*

- 14.*
# Mitigation for
# https://github.com/RoboStack/ros-jazzy/pull/126#issuecomment-3515455380
libcap:
- 2.77
fmt:
- 12.1
lua:
- 5.4
tbb:
- '2021'
- '2022'
tbb_devel:
- '2021'
- '2022'

# Workaround for https://github.com/RoboStack/ros-jazzy/pull/40#issuecomment-2782226697
cmake:
Expand Down Expand Up @@ -56,10 +63,9 @@ cxx_compiler_version: # [unix]
- 18 # [osx]

libzenohc:
- 1.5.1
- 1.7.2
libzenohcxx:
- 1.5.1
- 1.7.2

libhwloc:
- 2.11.2

- 2.12.2
30 changes: 30 additions & 0 deletions patch/ros-jazzy-ament-clang-format.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
diff --git a/ament_clang_format/ament_clang_format/main.py b/ament_clang_format/ament_clang_format/main.py
index 871206289..eb579572f 100755
--- a/ament_clang_format/ament_clang_format/main.py
+++ b/ament_clang_format/ament_clang_format/main.py
@@ -25,6 +25,8 @@

import yaml

+from ament_lint.filesystem_helpers import find_executable
+

def main(argv=sys.argv[1:]):
config_file = os.path.join(
@@ -245,16 +247,6 @@ def main(argv=sys.argv[1:]):
return rc


-def find_executable(file_names):
- paths = os.getenv('PATH').split(os.path.pathsep)
- for file_name in file_names:
- for path in paths:
- file_path = os.path.join(path, file_name)
- if os.path.isfile(file_path) and os.access(file_path, os.X_OK):
- return file_path
- return None
-
-
def get_files(paths, extensions):
files = []
for path in paths:
29 changes: 29 additions & 0 deletions patch/ros-jazzy-ament-clang-tidy.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git a/ament_clang_tidy/ament_clang_tidy/main.py b/ament_clang_tidy/ament_clang_tidy/main.py
index 5faa81425..e8c8c12c3 100755
--- a/ament_clang_tidy/ament_clang_tidy/main.py
+++ b/ament_clang_tidy/ament_clang_tidy/main.py
@@ -30,6 +30,7 @@

import yaml

+from ament_lint.filesystem_helpers import find_executable

def main(argv=sys.argv[1:]):
extensions = ['c', 'cc', 'cpp', 'cxx', 'h', 'hh', 'hpp', 'hxx']
@@ -265,16 +266,6 @@ def start_subprocess(full_cmd):
f.write(xml)


-def find_executable(file_names):
- paths = os.getenv('PATH').split(os.path.pathsep)
- for file_name in file_names:
- for path in paths:
- file_path = os.path.join(path, file_name)
- if os.path.isfile(file_path) and os.access(file_path, os.X_OK):
- return file_path
- return None
-
-
def get_compilation_db_files(paths):
files = []
for path in paths:
30 changes: 30 additions & 0 deletions patch/ros-jazzy-ament-lint.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
diff --git a/ament_lint/ament_lint/filesystem_helpers.py b/ament_lint/ament_lint/filesystem_helpers.py
new file mode 100644
index 000000000..c41e5907a
--- /dev/null
+++ b/ament_lint/ament_lint/filesystem_helpers.py
@@ -0,0 +1,22 @@
+# Copyright 2019 Open Source Robotics Foundation, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import shutil
+
+def find_executable(file_names: list[str]) -> str | None:
+ for name in file_names:
+ found = shutil.which(name)
+ if found:
+ return found
+ return None
\ No newline at end of file

101 changes: 101 additions & 0 deletions patch/ros-jazzy-async-web-server-cpp.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
diff --git a/include/async_web_server_cpp/http_connection.hpp b/include/async_web_server_cpp/http_connection.hpp
index 62ccd89..8b124c5 100644
--- a/include/async_web_server_cpp/http_connection.hpp
+++ b/include/async_web_server_cpp/http_connection.hpp
@@ -40,7 +40,7 @@ public:
ReadHandler;
typedef std::shared_ptr<const void> ResourcePtr;

- explicit HttpConnection(boost::asio::io_service& io_service,
+ explicit HttpConnection(boost::asio::io_context& io_context,
HttpServerRequestHandler request_handler);

boost::asio::ip::tcp::socket& socket();
@@ -79,7 +79,7 @@ private:
void handle_write(const boost::system::error_code& e,
std::vector<ResourcePtr> resources);

- boost::asio::io_service::strand strand_;
+ boost::asio::io_context::strand strand_;
boost::asio::ip::tcp::socket socket_;
HttpServerRequestHandler request_handler_;
boost::array<char, 8192> buffer_;
diff --git a/include/async_web_server_cpp/http_server.hpp b/include/async_web_server_cpp/http_server.hpp
index f772f55..ee99c72 100644
--- a/include/async_web_server_cpp/http_server.hpp
+++ b/include/async_web_server_cpp/http_server.hpp
@@ -40,7 +40,7 @@ private:

void handle_accept(const boost::system::error_code& e);

- boost::asio::io_service io_service_;
+ boost::asio::io_context io_context_;
boost::asio::ip::tcp::acceptor acceptor_;
std::size_t thread_pool_size_;
std::vector<boost::shared_ptr<boost::thread>> threads_;
diff --git a/src/http_connection.cpp b/src/http_connection.cpp
index bcb77d4..bb43f8a 100644
--- a/src/http_connection.cpp
+++ b/src/http_connection.cpp
@@ -6,9 +6,9 @@
namespace async_web_server_cpp
{

-HttpConnection::HttpConnection(boost::asio::io_service& io_service,
+HttpConnection::HttpConnection(boost::asio::io_context& io_context,
HttpServerRequestHandler handler)
- : strand_(io_service), socket_(io_service), request_handler_(handler),
+ : strand_(io_context), socket_(io_context), request_handler_(handler),
write_in_progress_(false)
{
}
diff --git a/src/http_server.cpp b/src/http_server.cpp
index 2c1c4ea..322f5b9 100644
--- a/src/http_server.cpp
+++ b/src/http_server.cpp
@@ -8,14 +8,14 @@ namespace async_web_server_cpp
HttpServer::HttpServer(const std::string& address, const std::string& port,
HttpServerRequestHandler request_handler,
std::size_t thread_pool_size)
- : acceptor_(io_service_), thread_pool_size_(thread_pool_size),
+ : acceptor_(io_context_), thread_pool_size_(thread_pool_size),
request_handler_(request_handler)
{

- boost::asio::ip::tcp::resolver resolver(io_service_);
- boost::asio::ip::tcp::resolver::query query(
- address, port, boost::asio::ip::resolver_query_base::flags());
- boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
+ boost::asio::ip::tcp::resolver resolver(io_context_);
+ boost::asio::ip::tcp::resolver::results_type endpoints =
+ resolver.resolve(address, port);
+ boost::asio::ip::tcp::endpoint endpoint = *endpoints.begin();
acceptor_.open(endpoint.protocol());
acceptor_.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
acceptor_.bind(endpoint);
@@ -33,14 +33,14 @@ void HttpServer::run()
for (std::size_t i = 0; i < thread_pool_size_; ++i)
{
boost::shared_ptr<boost::thread> thread(new boost::thread(
- boost::bind(&boost::asio::io_service::run, &io_service_)));
+ boost::bind(&boost::asio::io_context::run, &io_context_)));
threads_.push_back(thread);
}
}

void HttpServer::start_accept()
{
- new_connection_.reset(new HttpConnection(io_service_, request_handler_));
+ new_connection_.reset(new HttpConnection(io_context_, request_handler_));
acceptor_.async_accept(new_connection_->socket(),
boost::bind(&HttpServer::handle_accept, this,
boost::asio::placeholders::error));
@@ -62,7 +62,7 @@ void HttpServer::stop()
acceptor_.cancel();
acceptor_.close();
}
- io_service_.stop();
+ io_context_.stop();
// Wait for all threads in the pool to exit.
for (std::size_t i = 0; i < threads_.size(); ++i)
threads_[i]->join();
13 changes: 0 additions & 13 deletions patch/ros-jazzy-controller-interface.osx.patch

This file was deleted.

8 changes: 4 additions & 4 deletions patch/ros-jazzy-foxglove-bridge.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ index a72a85b..9550019 100644
set(FOXGLOVE_SDK_SHA "574c3ce006d6131d6519b416f25ef37c5b2a0721ef49c894286c79a5a5e0b4fc")
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+ set(FOXGLOVE_SDK_PLATFORM "aarch64-apple-darwin")
+ set(FOXGLOVE_SDK_SHA "015d660ede95ad4d37f84e83e8ebbe81545f1d3c9fea4a24667baf692267f151")
+ set(FOXGLOVE_SDK_SHA "2ca081fa503211aba4e89fba26f5edf6174e3978620267f95700e1da559922e3")
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+ set(FOXGLOVE_SDK_PLATFORM "x86_64-apple-darwin")
+ set(FOXGLOVE_SDK_SHA "07a1903013639ae872be9fcee8ccf72224a20cc142e642063a226ba2c2b54196")
+ set(FOXGLOVE_SDK_SHA "c639c62143995bfc79e9cbe9eb9c170269acfa55b733bc2787742a1801d3b7b3")
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
+ set(FOXGLOVE_SDK_PLATFORM "aarch64-pc-windows-msvc")
+ set(FOXGLOVE_SDK_SHA "caa797bad483ee2f1013c39a8997a409a45515f15e62ead9011351f12596f57d")
+ set(FOXGLOVE_SDK_SHA "3d1fc78ab0e870ad524cecd53857b9297999fe162548459287c477a307fff832")
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
+ set(FOXGLOVE_SDK_PLATFORM "x86_64-pc-windows-msvc")
+ set(FOXGLOVE_SDK_SHA "906a5658a207dfe929a6b75f39e0064efdb6182d923e695617fcfa10d311f349")
+ set(FOXGLOVE_SDK_SHA "f45238d567a9d576ba201f5bc407f0240bbb987f3c2e7cebda562269c7c1c310")
else()
message(FATAL_ERROR "Unsupported platform/architecture combination: ${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}")
endif()
Loading