From c5008d2401f6deed7919ea1fc9f8f0361e90dbe7 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 4 Sep 2025 23:44:11 -0500 Subject: [PATCH 1/2] Vendor CLI11 in gz-utils CLI11 is not yet available on ci.ros2.org, so use the vendored version Signed-off-by: Addisu Z. Taddese --- create_gz_vendor_pkg/create_vendor_package.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/create_gz_vendor_pkg/create_vendor_package.py b/create_gz_vendor_pkg/create_vendor_package.py index ffce4bd..e7fe088 100644 --- a/create_gz_vendor_pkg/create_vendor_package.py +++ b/create_gz_vendor_pkg/create_vendor_package.py @@ -334,6 +334,11 @@ def create_cmake_file(src_pkg_xml: Package, extra_params: dict): if pkg_has_docs(pkg_name_no_version) and not build_docs_deprecated(src_pkg_xml): params["cmake_args"] = ["-DBUILD_DOCS:BOOL=OFF"] + # CLI11 is not available on ci.ros2.org, which uses a curated list of dependencies instead of rosdep. + # TODO(azeey): Remove this once ros2/cli#825 and ros2/ros2#1745 are merged + if pkg_name_no_version == "gz-utils": + params["cmake_args"].append("-DGZ_UTILS_VENDOR_CLI11=ON") + if pkg_has_pybind11(pkg_name_no_version) and params["versioned_package_name"]: params["cmake_args"].append("-DSKIP_PYBIND11:BOOL=ON") if pkg_has_swig(pkg_name_no_version): From ed5f4507fc7a7cca9d540629bb68f3a86b55beef Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Fri, 5 Sep 2025 11:58:28 -0700 Subject: [PATCH 2/2] Update create_gz_vendor_pkg/create_vendor_package.py --- create_gz_vendor_pkg/create_vendor_package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/create_gz_vendor_pkg/create_vendor_package.py b/create_gz_vendor_pkg/create_vendor_package.py index e7fe088..df54c6b 100644 --- a/create_gz_vendor_pkg/create_vendor_package.py +++ b/create_gz_vendor_pkg/create_vendor_package.py @@ -335,7 +335,7 @@ def create_cmake_file(src_pkg_xml: Package, extra_params: dict): params["cmake_args"] = ["-DBUILD_DOCS:BOOL=OFF"] # CLI11 is not available on ci.ros2.org, which uses a curated list of dependencies instead of rosdep. - # TODO(azeey): Remove this once ros2/cli#825 and ros2/ros2#1745 are merged + # TODO(azeey): Remove this once ros2/ci#825 and ros2/ros2#1745 are merged if pkg_name_no_version == "gz-utils": params["cmake_args"].append("-DGZ_UTILS_VENDOR_CLI11=ON")