Skip to content

Commit

Permalink
Remove uncrustify from CI
Browse files Browse the repository at this point in the history 
Signed-off-by: Luca Della Vedova <lucadv@intrinsic.ai>
  • Loading branch information
@luca-della-vedova
luca-della-vedova committed Nov 19, 2024
1 parent 0e9ae2a commit abcda78
Show file tree
Hide file tree
Showing 11 changed files with 75 additions and 63 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/style.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v2
- name: uncrustify
run: |
sudo apt update && sudo apt install -y ros-jazzy-rmf-utils
/ros_entrypoint.sh ament_uncrustify -c /opt/ros/jazzy/share/rmf_utils/rmf_code_style.cfg . --language C++ --exclude nexus_endpoints/nexus_endpoints.hpp
# TODO(luca) reintroduce after formatting
#- name: uncrustify
# run: |
# sudo apt update && sudo apt install -y ros-jazzy-rmf-utils
# /ros_entrypoint.sh ament_uncrustify -c /opt/ros/jazzy/share/rmf_utils/rmf_code_style.cfg . --language C++ --exclude nexus_endpoints/nexus_endpoints.hpp
- name: pycodestyle
run: |
sudo apt update && sudo apt install -y pycodestyle curl
Expand Down
13 changes: 7 additions & 6 deletions nexus_capabilities/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,13 @@ if(BUILD_TESTING)
NAMES "rmf_code_style.cfg"
PATHS "${rmf_utils_DIR}/../../../../share/rmf_utils/")

ament_uncrustify(
ARGN include src
CONFIG_FILE ${uncrustify_config_file}
MAX_LINE_LENGTH 80
LANGUAGE CPP
)
# TODO(luca) Add uncrustify back after formatting
#ament_uncrustify(
# ARGN include src
# CONFIG_FILE ${uncrustify_config_file}
# MAX_LINE_LENGTH 80
# LANGUAGE CPP
#)
endif()

include(GNUInstallDirs)
Expand Down
13 changes: 7 additions & 6 deletions nexus_common/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,13 @@ if(BUILD_TESTING)
NAMES "rmf_code_style.cfg"
PATHS "${rmf_utils_DIR}/../../../../share/rmf_utils/")

ament_uncrustify(
ARGN include src
CONFIG_FILE ${uncrustify_config_file}
MAX_LINE_LENGTH 80
LANGUAGE CPP
)
# TODO(luca) Add uncrustify back after formatting
#ament_uncrustify(
# ARGN include src
# CONFIG_FILE ${uncrustify_config_file}
# MAX_LINE_LENGTH 80
# LANGUAGE CPP
#)

# Adds a ament catch2 test with some common libraries.
# Usage: nexus_add_test(<target> <source>...)
Expand Down
13 changes: 7 additions & 6 deletions nexus_integration_tests/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,13 @@ if(BUILD_TESTING)
NAMES "rmf_code_style.cfg"
PATHS "${rmf_utils_DIR}/../../../../share/rmf_utils/")

ament_uncrustify(
ARGN include src test
CONFIG_FILE ${uncrustify_config_file}
MAX_LINE_LENGTH 80
LANGUAGE C++
)
# TODO(luca) Add uncrustify back after formatting
#ament_uncrustify(
# ARGN include src test
# CONFIG_FILE ${uncrustify_config_file}
# MAX_LINE_LENGTH 80
# LANGUAGE CPP
#)

if (ament_cmake_catch2_FOUND)
find_package(ament_index_cpp REQUIRED)
Expand Down
13 changes: 7 additions & 6 deletions nexus_lifecycle_manager/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,13 @@ if(BUILD_TESTING)
NAMES "rmf_code_style.cfg"
PATHS "${rmf_utils_DIR}/../../../../share/rmf_utils/")

ament_uncrustify(
ARGN include src test
CONFIG_FILE ${uncrustify_config_file}
MAX_LINE_LENGTH 80
LANGUAGE C++
)
# TODO(luca) Add uncrustify back after formatting
#ament_uncrustify(
# ARGN include src test
# CONFIG_FILE ${uncrustify_config_file}
# MAX_LINE_LENGTH 80
# LANGUAGE CPP
#)

find_package(ament_cmake_catch2 QUIET)
if (ament_cmake_catch2_FOUND)
Expand Down
13 changes: 7 additions & 6 deletions nexus_motion_planner/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,13 @@ if(BUILD_TESTING)
RUNTIME DESTINATION lib/${PROJECT_NAME}
)

ament_uncrustify(
ARGN include src test
CONFIG_FILE ${uncrustify_config_file}
MAX_LINE_LENGTH 80
LANGUAGE CPP
)
# TODO(luca) Add uncrustify back after formatting
#ament_uncrustify(
# ARGN include src test
# CONFIG_FILE ${uncrustify_config_file}
# MAX_LINE_LENGTH 80
# LANGUAGE CPP
#)

# TODO(luca) reintroduce this test, it was failing since the beginning so unclear
# what it it supposed to do
Expand Down
13 changes: 7 additions & 6 deletions nexus_robot_controller/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,13 @@ if(BUILD_TESTING)
NAMES "rmf_code_style.cfg"
PATHS "${rmf_utils_DIR}/../../../../share/rmf_utils/")

ament_uncrustify(
ARGN include src
CONFIG_FILE ${uncrustify_config_file}
MAX_LINE_LENGTH 80
LANGUAGE CPP
)
# TODO(luca) Add uncrustify back after formatting
#ament_uncrustify(
# ARGN include src
# CONFIG_FILE ${uncrustify_config_file}
# MAX_LINE_LENGTH 80
# LANGUAGE CPP
#)

find_package(launch_testing_ament_cmake)
install(DIRECTORY test DESTINATION share/${PROJECT_NAME})
Expand Down
13 changes: 7 additions & 6 deletions nexus_rviz_plugins/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,13 @@ if(BUILD_TESTING)
NAMES "rmf_code_style.cfg"
PATHS "${rmf_utils_DIR}/../../../../share/rmf_utils/")

ament_uncrustify(
ARGN include src test
CONFIG_FILE ${uncrustify_config_file}
MAX_LINE_LENGTH 80
LANGUAGE C++
)
# TODO(luca) Add uncrustify back after formatting
#ament_uncrustify(
# ARGN include src test
# CONFIG_FILE ${uncrustify_config_file}
# MAX_LINE_LENGTH 80
# LANGUAGE CPP
#)
endif()

ament_package()
13 changes: 7 additions & 6 deletions nexus_system_orchestrator/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,13 @@ if(BUILD_TESTING)
NAMES "rmf_code_style.cfg"
PATHS "${rmf_utils_DIR}/../../../../share/rmf_utils/")

ament_uncrustify(
ARGN include src
CONFIG_FILE ${uncrustify_config_file}
MAX_LINE_LENGTH 80
LANGUAGE CPP
)
# TODO(luca) Add uncrustify back after formatting
#ament_uncrustify(
# ARGN include src
# CONFIG_FILE ${uncrustify_config_file}
# MAX_LINE_LENGTH 80
# LANGUAGE CPP
#)

# Adds a ament catch2 test with some common libraries.
# Usage: nexus_add_test(<target> <source>...)
Expand Down
12 changes: 7 additions & 5 deletions nexus_transporter/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,13 @@ if(BUILD_TESTING AND ament_cmake_uncrustify_FOUND AND ament_cmake_catch2_FOUND)
NAMES "rmf_code_style.cfg"
PATHS "${rmf_utils_DIR}/../../../../share/rmf_utils/")

ament_uncrustify(
ARGN include src test
CONFIG_FILE ${uncrustify_config_file}
MAX_LINE_LENGTH 80
)
# TODO(luca) Add uncrustify back after formatting
#ament_uncrustify(
# ARGN include src test
# CONFIG_FILE ${uncrustify_config_file}
# MAX_LINE_LENGTH 80
# LANGUAGE CPP
#)

ament_add_catch2(test_nexus_transporter
test/main.cpp
Expand Down
13 changes: 7 additions & 6 deletions nexus_workcell_orchestrator/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,13 @@ if(BUILD_TESTING)
NAMES "rmf_code_style.cfg"
PATHS "${rmf_utils_DIR}/../../../../share/rmf_utils/")

ament_uncrustify(
ARGN include src
CONFIG_FILE ${uncrustify_config_file}
MAX_LINE_LENGTH 80
LANGUAGE CPP
)
# TODO(luca) Add uncrustify back after formatting
#ament_uncrustify(
# ARGN include src
# CONFIG_FILE ${uncrustify_config_file}
# MAX_LINE_LENGTH 80
# LANGUAGE CPP
#)

# Adds a ament catch2 test with some common libraries.
# Usage: nexus_add_test(<target> <source>...)
Expand Down

0 comments on commit abcda78

Please sign in to comment.