Merge pull request #74 from christianrauch/almalinux8

add AlmaLinux 8 and fix warnings
christianrauch · Dec 30, 2024 · c9280be · c9280be
2 parents 3b07894 + 81040ae
commit c9280be
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 33 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,24 +13,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - distribution: ubuntu
-            version: 22.04
-            ros: humble
-
-          - distribution: ubuntu
-            version: 24.04
-            ros: jazzy
-
-          - distribution: almalinux
-            version: 9
-            ros: jazzy
+          - {distribution: ubuntu,    version: 22.04, ros: humble}
+          - {distribution: ubuntu,    version: 24.04, ros: jazzy}
+          - {distribution: almalinux, version: 8,     ros: humble}
+          - {distribution: almalinux, version: 9,     ros: jazzy}
 
     continue-on-error: ${{ matrix.ros == 'rolling' }}
 
     container:
       image: ${{ matrix.distribution }}:${{ matrix.version }}
-      env:
-        PIP_BREAK_SYSTEM_PACKAGES: 1
 
     steps:
       - name: install ROS 2
@@ -41,15 +32,25 @@ jobs:
         run: |
           dnf -y install libasan python3-mypy
 
-      - name: build and test
-        uses: ros-tooling/[email protected]
+      - name: setup rosdep
+        run: |
+          rosdep update
+
+      - name: setup mixins
+        run: |
+          colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
+          colcon mixin update default
+
+      - uses: actions/checkout@v4
         with:
-          package-name: camera_ros
-          target-ros2-distro: ${{ matrix.ros }}
-          colcon-defaults: |
-            {
-              "build": {
-                "mixin": ["asan-gcc", "tsan", "coverage-gcc", "memcheck"]
-              }
-            }
-          colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/5d51dff38097e8c2bf46d7a5b804e65935aa7f47/index.yaml
+          path: src
+
+      - name: build and test
+        run: |
+          rosdep install --from-paths src --ignore-src -y --rosdistro ${{ matrix.ros }}
+          . /opt/ros/${{ matrix.ros }}/setup.sh
+          colcon build \
+            --event-handlers=console_cohesion+ \
+            --mixin asan-gcc tsan coverage-gcc memcheck \
+            --packages-up-to camera_ros
+          colcon test --return-code-on-test-failure --event-handlers=console_cohesion+
diff --git a/package.xml b/package.xml
@@ -22,6 +22,7 @@
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_cmake_clang_format</test_depend>
+  <test_depend>clang-format</test_depend>
   <test_depend>ament_cmake_cppcheck</test_depend>
   <test_depend>ament_cmake_flake8</test_depend>
   <test_depend>ament_cmake_lint_cmake</test_depend>

diff --git a/src/types.hpp b/src/types.hpp
@@ -25,12 +25,12 @@ to_string(const libcamera::ControlType id);
 template<libcamera::ControlType>
 struct ControlTypeMap;
 
-MAP(void, None);
-MAP(bool, Bool);
-MAP(uint8_t, Byte);
-MAP(int32_t, Integer32);
-MAP(int64_t, Integer64);
-MAP(float, Float);
-MAP(std::string, String);
-MAP(libcamera::Rectangle, Rectangle);
-MAP(libcamera::Size, Size);
+MAP(void, None)
+MAP(bool, Bool)
+MAP(uint8_t, Byte)
+MAP(int32_t, Integer32)
+MAP(int64_t, Integer64)
+MAP(float, Float)
+MAP(std::string, String)
+MAP(libcamera::Rectangle, Rectangle)
+MAP(libcamera::Size, Size)