From a5bb6e3102c8a7a2988d3704cc6e18bf7b234c7d Mon Sep 17 00:00:00 2001
From: Carlos Espinoza Curto <148376273+Carlosespicur@users.noreply.github.com>
Date: Thu, 16 Oct 2025 11:57:30 +0200
Subject: [PATCH 1/2] Fix failing build by ignoring rmw_test_fixture

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
---
 package.xml                   | 2 ++
 scripts/create_firmware_ws.sh | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.xml b/package.xml
index 97722d50..112a679a 100644
--- a/package.xml
+++ b/package.xml
@@ -12,6 +12,8 @@
   <depend>python3-yaml</depend>
   <depend>clang-tidy</depend>
 
+  <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>ament_lint_auto</buildtool_depend>
   <build_depend>flex</build_depend>
   <build_depend>bison</build_depend>
   <build_depend>libncurses-dev</build_depend>
diff --git a/scripts/create_firmware_ws.sh b/scripts/create_firmware_ws.sh
index 59cc5c5e..a2beb6bc 100755
--- a/scripts/create_firmware_ws.sh
+++ b/scripts/create_firmware_ws.sh
@@ -102,6 +102,10 @@ popd >/dev/null
 . $(dirname $0)/clean_env.sh
 if [ $RTOS != "host" ]; then
     pushd $FW_TARGETDIR/$DEV_WS_DIR >/dev/null
+        # Fix failing build by ignoring rmw_test_fixture_implementation.
+        touch ros2/ament_cmake_ros/rmw_test_fixture_implementation/COLCON_IGNORE
+        # Fix failing build by ignoring rmw_test_fixture.
+        touch ros2/ament_cmake_ros/rmw_test_fixture/COLCON_IGNORE
         colcon build
         set +o nounset
         # source dev workspace
@@ -114,4 +118,3 @@ rosdep install --os=ubuntu:noble -y --from-paths $PREFIX/config/$RTOS/$TARGET_FO
 
 # Creating specific firmware folder
 . $PREFIX/config/$RTOS/$TARGET_FOLDER/create.sh
-

From 6e9f962d3c2c4bf410ede056f3fe7a47dd9e580b Mon Sep 17 00:00:00 2001
From: Eugenio Collado <eugeniocollado@eprosima.com>
Date: Wed, 27 May 2026 12:14:19 +0200
Subject: [PATCH 2/2] Fix CI

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
---
 scripts/create_firmware_ws.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/create_firmware_ws.sh b/scripts/create_firmware_ws.sh
index a2beb6bc..fbf7ed2c 100755
--- a/scripts/create_firmware_ws.sh
+++ b/scripts/create_firmware_ws.sh
@@ -102,10 +102,6 @@ popd >/dev/null
 . $(dirname $0)/clean_env.sh
 if [ $RTOS != "host" ]; then
     pushd $FW_TARGETDIR/$DEV_WS_DIR >/dev/null
-        # Fix failing build by ignoring rmw_test_fixture_implementation.
-        touch ros2/ament_cmake_ros/rmw_test_fixture_implementation/COLCON_IGNORE
-        # Fix failing build by ignoring rmw_test_fixture.
-        touch ros2/ament_cmake_ros/rmw_test_fixture/COLCON_IGNORE
         colcon build
         set +o nounset
         # source dev workspace