From 2f0fe9f096380f6e20c539376386f838cebea467 Mon Sep 17 00:00:00 2001
From: SamuelFoo <fooenzesamuel@gmail.com>
Date: Fri, 19 Jun 2026 15:43:57 +0200
Subject: [PATCH] Fix CI/CD workflow and update package dependencies

---
 .github/workflows/build.yml  | 49 ++++++++++++------------------------
 .github/workflows/deps.repos |  9 +++++++
 package.xml                  |  2 +-
 3 files changed, 26 insertions(+), 34 deletions(-)
 create mode 100644 .github/workflows/deps.repos

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ca871ef..e0b81b6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,41 +1,24 @@
 name: CI/CD
 
-on: [push, pull_request]
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
 
 jobs:
   build:
-    runs-on: [self-hosted, ros2-humble]
+    runs-on: ubuntu-22.04
+    container:
+      image: rostooling/setup-ros-docker:ubuntu-jammy-latest
     steps:
-      # - name: Setup ROS
-      #   uses: ros-tooling/setup-ros@v0.3
-      #   with:
-      #     required-ros-distributions: noetic
+      - uses: actions/checkout@v4
 
-      # - name: Install packages
-      #     run: sudo apt-get install python3-catkin-tools xorg-dev libjsoncpp-dev qtbase5-dev
-
-      - name: Setup catkin workspace
-        run: source /opt/ros/humble/setup.bash
-
-      - name: Check out repo
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.CI_TOKEN }}
-          path: src/image_matching
-
-      - name: Check out bb_msgs
-        uses: actions/checkout@v3
+      - name: Build ROS 2 package
+        uses: ros-tooling/action-ros-ci@v0.3
         with:
-          repository: BumblebeeAS/bb_msgs
-          token: ${{ secrets.CI_TOKEN }}
-          path: src/bb_msgs
-          ref: humble
-
-      - name: Install dependencies
-        run: source /opt/ros/humble/setup.bash && rosdep update && rosdep install --from-paths src -i -r -y
-
-      - name: Build
-        run: source /opt/ros/humble/setup.bash && colcon build
-
-      # - name: Run tests
-      #   run: source devel/setup.bash && ./src/image_matching/tests/test_matcher_service.py
+          package-name: image_matching
+          target-ros2-distro: humble
+          vcs-repo-file-url: ${{ github.workspace }}/.github/workflows/deps.repos
+          skip-tests: true
diff --git a/.github/workflows/deps.repos b/.github/workflows/deps.repos
new file mode 100644
index 0000000..8a1f4b8
--- /dev/null
+++ b/.github/workflows/deps.repos
@@ -0,0 +1,9 @@
+repositories:
+  bb_msgs:
+    type: git
+    url: https://github.com/BumblebeeAS/bb_msgs.git
+    version: humble
+  image_processing:
+    type: git
+    url: https://github.com/BumblebeeAS/image_processing.git
+    version: main
diff --git a/package.xml b/package.xml
index 9ec9a06..af07d69 100644
--- a/package.xml
+++ b/package.xml
@@ -10,7 +10,7 @@
   <!-- 3rd party -->
   <exec_depend>image_transport</exec_depend>
   <exec_depend>python-opencv-contrib-pip</exec_depend>
-  <exec_depend>python3-transforms3d-pip</exec_depend>
+  <exec_depend>python-transforms3d-pip</exec_depend>
   <exec_depend>python3-imutils-pip</exec_depend>
   <exec_depend>rosidl_default_runtime</exec_depend>