Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/ci-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
source /opt/ros/${{ matrix.ROS_DISTRO }}/setup.bash

cd src/scorpio_utils
find . -name "*.cpp" -o -name "*.hpp" -o -name "*.h" -o -name "*.cc" -o -name "*.cxx" -o -name "*.hh" -o -name "*.hxx" | grep -v external_packages | xargs -r ament_cpplint
find . -name "*.cpp" -o -name "*.hpp" -o -name "*.h" -o -name "*.cc" -o -name "*.cxx" -o -name "*.hh" -o -name "*.hxx" | grep -v external_packages | grep -v 'include/magic_enum/' | xargs -r ament_cpplint

- name: Run ament_uncrustify
if: matrix.ROS_DISTRO == 'humble'
Expand All @@ -80,7 +80,7 @@ jobs:
run: |
source /opt/ros/${{ matrix.ROS_DISTRO }}/setup.bash
cd src/scorpio_utils
find . -name "*.cpp" -o -name "*.hpp" -o -name "*.h" -o -name "*.cc" -o -name "*.cxx" -o -name "*.hh" -o -name "*.hxx" | grep -v external_packages | xargs -r ament_uncrustify -c /workspace/src/scorpio_utils/uncrustify.cfg
find . -name "*.cpp" -o -name "*.hpp" -o -name "*.h" -o -name "*.cc" -o -name "*.cxx" -o -name "*.hh" -o -name "*.hxx" | grep -v external_packages | grep -v 'include/magic_enum/' | xargs -r ament_uncrustify -c /workspace/src/scorpio_utils/uncrustify.cfg

- name: Run ament_black
if: matrix.ROS_DISTRO == 'humble'
Expand All @@ -89,7 +89,7 @@ jobs:
run: |
source /opt/ros/${{ matrix.ROS_DISTRO }}/setup.bash
cd src/scorpio_utils
find . -name "*.py" -not -path "*/launch/*" -not -path "*launch_ROS2*" -not -path "*external_packages*" | xargs -r ament_black
find . -name "*.py" -not -path "*/launch/*" -not -path "*launch_ROS2*" -not -path "*external_packages*" | grep -v 'include/magic_enum/' | xargs -r ament_black

- name: Run ament_lint_cmake
if: matrix.ROS_DISTRO == 'humble'
Expand All @@ -98,7 +98,7 @@ jobs:
run: |
source /opt/ros/${{ matrix.ROS_DISTRO }}/setup.bash
cd src/scorpio_utils
find . -name "CMakeLists.txt" | grep -v external_packages | xargs -r ament_lint_cmake
find . -name "CMakeLists.txt" | grep -v external_packages | grep -v 'include/magic_enum/' | xargs -r ament_lint_cmake

- name: Run ament_xmllint
if: matrix.ROS_DISTRO == 'humble'
Expand All @@ -107,7 +107,7 @@ jobs:
run: |
source /opt/ros/${{ matrix.ROS_DISTRO }}/setup.bash
cd src/scorpio_utils
find . -name "*.xml" | grep -v external_packages | xargs -r ament_xmllint
find . -name "*.xml" | grep -v external_packages | grep -v 'include/magic_enum/' | xargs -r ament_xmllint

- name: Set timezone and install additional dependencies
run: |
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

9 changes: 4 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ find_package(backward_ros REQUIRED)
find_package(rclcpp REQUIRED)
find_package(std_msgs REQUIRED)
find_package(fmt REQUIRED)
find_package(magic_enum CONFIG REQUIRED)

if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
message(STATUS "Detected architecture: x64")
Expand Down Expand Up @@ -69,7 +68,7 @@ add_library(network SHARED
src/network/scorpio_udp.cpp
src/network/udp.cpp
)
target_link_libraries(network magic_enum::magic_enum fmt::fmt)
target_link_libraries(network fmt::fmt)

target_compile_definitions(network PRIVATE
-DSCU_LOG_LEVEL=5
Expand Down Expand Up @@ -175,7 +174,7 @@ if(BUILD_TESTING)
src/network/ip.cpp
src/network/scorpio_udp.cpp
)
target_link_libraries(network_mock fmt::fmt magic_enum::magic_enum)
target_link_libraries(network_mock fmt::fmt)

# Test of mock_udp.cpp required for network tests
ament_add_gtest(test_mock_udp test/network/test_udp.cpp)
Expand Down Expand Up @@ -220,7 +219,7 @@ if(BUILD_TESTING)
src/network/ip.cpp
src/network/scorpio_udp.cpp
)
target_link_libraries(network_gmock fmt::fmt magic_enum::magic_enum)
target_link_libraries(network_gmock fmt::fmt)
target_compile_options(network_gmock PRIVATE -std=gnu++17)
target_compile_definitions(network_gmock PRIVATE
-DSCORPIO_UTILS_UDP_GMOCK=1
Expand Down Expand Up @@ -254,7 +253,7 @@ if(BUILD_TESTING)
src/network/ip.cpp
src/network/scorpio_udp.cpp
)
target_link_libraries(network_framework_test fmt::fmt magic_enum::magic_enum)
target_link_libraries(network_framework_test fmt::fmt)
target_compile_definitions(network_framework_test PRIVATE
-DSCORPIO_UTILS_FRAMEWORK=1
-DSCU_LOG_LEVEL=5
Expand Down
Loading
Loading