From d0d20c88d8b3e5ae81bc47ee809c26d7ca6db8dd Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Thu, 15 Oct 2020 07:22:44 +0100 Subject: [PATCH 1/6] update linters --- .github/workflows/lint.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ca8edbe530..bb712d57d7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,9 +14,11 @@ jobs: with: linter: copyright package-name: | + diff_drive_controller + forward_command_controller joint_state_controller joint_trajectory_controller - diff_drive_controller + position_controllers ament_xmllint: name: ament_xmllint runs-on: ubuntu-18.04 @@ -27,10 +29,12 @@ jobs: with: linter: xmllint package-name: | - ros2_controllers + diff_drive_controller + forward_command_controller joint_state_controller joint_trajectory_controller - diff_drive_controller + position_controllers + ros2_controllers ament_lint_cpp: # Linters applicable to C++ packages name: ament_${{ matrix.linter }} runs-on: ubuntu-18.04 @@ -45,6 +49,8 @@ jobs: with: linter: ${{ matrix.linter }} package-name: | + diff_drive_controller + forward_command_controller joint_state_controller joint_trajectory_controller - diff_drive_controller + position_controllers From 5bbc308701ffa3b9f076118f496c9cd5b806db11 Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Thu, 15 Oct 2020 07:22:52 +0100 Subject: [PATCH 2/6] add industrial_ci with upstream workspace --- .github/workflows/ci.yml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15c9e8086c..3dde6fdbe2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,19 +10,21 @@ on: jobs: # Re-enable once ros2_controls is released completely - # ci_binary: - # name: Foxy binary job - # runs-on: ubuntu-latest - # strategy: - # matrix: - # env: - # - {ROS_DISTRO: foxy, ROS_REPO: main} - # - {ROS_DISTRO: foxy, ROS_REPO: testing} - # steps: - # - run: sudo apt-get update -qq && sudo apt-get upgrade - # - uses: actions/checkout@v1 - # - uses: 'ros-industrial/industrial_ci@master' - # env: ${{matrix.env}} + ci_binary: + name: Foxy binary job + runs-on: ubuntu-latest + strategy: + matrix: + env: + - {ROS_DISTRO: foxy, ROS_REPO: main} + - {ROS_DISTRO: foxy, ROS_REPO: testing} + env: + UPSTREAM_WORKSPACE: .github/workspace.repos + steps: + - run: sudo apt-get update -qq && sudo apt-get upgrade + - uses: actions/checkout@v1 + - uses: 'ros-industrial/industrial_ci@master' + env: ${{matrix.env}} ci_source: name: Foxy source job From 1fc2f9e0970be7317305efd204e5181ee1bfe847 Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Thu, 15 Oct 2020 07:29:10 +0100 Subject: [PATCH 3/6] update indent --- .github/workflows/ci.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3dde6fdbe2..ddf51318ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,21 +10,21 @@ on: jobs: # Re-enable once ros2_controls is released completely - ci_binary: - name: Foxy binary job - runs-on: ubuntu-latest - strategy: - matrix: - env: - - {ROS_DISTRO: foxy, ROS_REPO: main} - - {ROS_DISTRO: foxy, ROS_REPO: testing} - env: - UPSTREAM_WORKSPACE: .github/workspace.repos - steps: - - run: sudo apt-get update -qq && sudo apt-get upgrade - - uses: actions/checkout@v1 - - uses: 'ros-industrial/industrial_ci@master' - env: ${{matrix.env}} + ci_binary: + name: Foxy binary job + runs-on: ubuntu-latest + strategy: + matrix: + env: + - {ROS_DISTRO: foxy, ROS_REPO: main} + - {ROS_DISTRO: foxy, ROS_REPO: testing} + env: + UPSTREAM_WORKSPACE: .github/workspace.repos + steps: + - run: sudo apt-get update -qq && sudo apt-get upgrade + - uses: actions/checkout@v1 + - uses: 'ros-industrial/industrial_ci@master' + env: ${{matrix.env}} ci_source: name: Foxy source job From 9cb49d6a699023bd2fefcbbb980687f2bf03cf37 Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Thu, 22 Oct 2020 07:24:45 +0100 Subject: [PATCH 4/6] Disable pluginlib using boost --- diff_drive_controller/CMakeLists.txt | 3 ++- effort_controllers/CMakeLists.txt | 3 ++- forward_command_controller/CMakeLists.txt | 3 ++- joint_state_controller/CMakeLists.txt | 3 ++- joint_trajectory_controller/CMakeLists.txt | 6 +++--- position_controllers/CMakeLists.txt | 3 ++- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/diff_drive_controller/CMakeLists.txt b/diff_drive_controller/CMakeLists.txt index f5e090d6c1..19402825e5 100644 --- a/diff_drive_controller/CMakeLists.txt +++ b/diff_drive_controller/CMakeLists.txt @@ -47,7 +47,8 @@ ament_target_dependencies(diff_drive_controller # Causes the visibility macros to use dllexport rather than dllimport, # which is appropriate when building the dll but not consuming it. target_compile_definitions(diff_drive_controller PRIVATE "DIFF_DRIVE_CONTROLLER_BUILDING_DLL") - +# prevent pluginlib from using boost +target_compile_definitions(diff_drive_controller PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") pluginlib_export_plugin_description_file(controller_interface diff_drive_plugin.xml) install(DIRECTORY include/ diff --git a/effort_controllers/CMakeLists.txt b/effort_controllers/CMakeLists.txt index 344a7691f2..699e8ed2b5 100644 --- a/effort_controllers/CMakeLists.txt +++ b/effort_controllers/CMakeLists.txt @@ -29,7 +29,8 @@ ament_target_dependencies(effort_controllers # Causes the visibility macros to use dllexport rather than dllimport, # which is appropriate when building the dll but not consuming it. target_compile_definitions(effort_controllers PRIVATE "EFFORT_CONTROLLERS_BUILDING_DLL") - +# prevent pluginlib from using boost +target_compile_definitions(effort_controllers PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") pluginlib_export_plugin_description_file(controller_interface effort_controllers_plugins.xml) install( diff --git a/forward_command_controller/CMakeLists.txt b/forward_command_controller/CMakeLists.txt index b1dc458c75..be16d872f2 100644 --- a/forward_command_controller/CMakeLists.txt +++ b/forward_command_controller/CMakeLists.txt @@ -38,7 +38,8 @@ ament_target_dependencies(forward_command_controller # Causes the visibility macros to use dllexport rather than dllimport, # which is appropriate when building the dll but not consuming it. target_compile_definitions(forward_command_controller PRIVATE "FORWARD_COMMAND_CONTROLLER_BUILDING_DLL") - +# prevent pluginlib from using boost +target_compile_definitions(forward_command_controller PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") pluginlib_export_plugin_description_file(controller_interface forward_command_plugin.xml) install( diff --git a/joint_state_controller/CMakeLists.txt b/joint_state_controller/CMakeLists.txt index 2875416ae1..a48a7f7f63 100644 --- a/joint_state_controller/CMakeLists.txt +++ b/joint_state_controller/CMakeLists.txt @@ -35,7 +35,8 @@ ament_target_dependencies(joint_state_controller # Causes the visibility macros to use dllexport rather than dllimport, # which is appropriate when building the dll but not consuming it. target_compile_definitions(joint_state_controller PRIVATE "JOINT_STATE_CONTROLLER_BUILDING_DLL") - +# prevent pluginlib from using boost +target_compile_definitions(joint_state_controller PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") pluginlib_export_plugin_description_file(controller_interface joint_state_plugin.xml) install( diff --git a/joint_trajectory_controller/CMakeLists.txt b/joint_trajectory_controller/CMakeLists.txt index 8b8179e4aa..ae5fa7cdaa 100644 --- a/joint_trajectory_controller/CMakeLists.txt +++ b/joint_trajectory_controller/CMakeLists.txt @@ -42,9 +42,9 @@ ament_target_dependencies(joint_trajectory_controller ) # Causes the visibility macros to use dllexport rather than dllimport, # which is appropriate when building the dll but not consuming it. -target_compile_definitions(joint_trajectory_controller PRIVATE - "JOINT_TRAJECTORY_CONTROLLER_BUILDING_DLL" "_USE_MATH_DEFINES") - +target_compile_definitions(joint_trajectory_controller PRIVATE "JOINT_TRAJECTORY_CONTROLLER_BUILDING_DLL" "_USE_MATH_DEFINES") +# prevent pluginlib from using boost +target_compile_definitions(joint_trajectory_controller PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") pluginlib_export_plugin_description_file(controller_interface joint_trajectory_plugin.xml) install(DIRECTORY include/ diff --git a/position_controllers/CMakeLists.txt b/position_controllers/CMakeLists.txt index 0cc8c229a2..cfca599a3a 100644 --- a/position_controllers/CMakeLists.txt +++ b/position_controllers/CMakeLists.txt @@ -29,7 +29,8 @@ ament_target_dependencies(position_controllers # Causes the visibility macros to use dllexport rather than dllimport, # which is appropriate when building the dll but not consuming it. target_compile_definitions(position_controllers PRIVATE "POSITION_CONTROLLERS_BUILDING_DLL") - +# prevent pluginlib from using boost +target_compile_definitions(position_controllers PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") pluginlib_export_plugin_description_file(controller_interface position_controllers_plugins.xml) install( From ca56a0de93629b95695fe3d52755eeac5edd1631 Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Thu, 22 Oct 2020 07:51:10 +0100 Subject: [PATCH 5/6] remove comment --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ddf51318ca..f20bc314d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,6 @@ on: - cron: '17 8 * * *' jobs: - # Re-enable once ros2_controls is released completely ci_binary: name: Foxy binary job runs-on: ubuntu-latest From 9c5bca33900e291942bd53cf301cd0b584c82eaa Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Thu, 22 Oct 2020 07:54:14 +0100 Subject: [PATCH 6/6] Update packages and linters version --- .github/workflows/ci.yml | 10 +++++++--- .github/workflows/lint.yml | 20 ++++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f20bc314d5..6a192fdcad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,18 +31,22 @@ jobs: strategy: fail-fast: false steps: - - uses: ros-tooling/setup-ros@0.0.23 + - uses: ros-tooling/setup-ros@0.0.26 with: required-ros-distributions: foxy - - uses: ros-tooling/action-ros-ci@0.0.17 + - uses: ros-tooling/action-ros-ci@0.0.19 with: - source-ros-binary-installation: foxy + target-ros2-distro: foxy # build all packages listed in the meta package package-name: | diff_drive_controller + effort_controllers + forward_command_controller joint_state_controller joint_trajectory_controller + position_controllers ros2_controllers + velocity_controllers vcs-repo-file-url: | https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/.github/workspace.repos colcon-mixin-name: coverage-gcc diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bb712d57d7..8104c9ea69 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,32 +9,37 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 - - uses: ros-tooling/setup-ros@0.0.13 - - uses: ros-tooling/action-ros-lint@0.0.5 + - uses: ros-tooling/setup-ros@0.0.26 + - uses: ros-tooling/action-ros-lint@0.0.6 with: linter: copyright package-name: | diff_drive_controller + effort_controllers forward_command_controller joint_state_controller joint_trajectory_controller position_controllers + ros2_controllers + velocity_controllers ament_xmllint: name: ament_xmllint runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 - - uses: ros-tooling/setup-ros@0.0.13 - - uses: ros-tooling/action-ros-lint@0.0.5 + - uses: ros-tooling/setup-ros@0.0.26 + - uses: ros-tooling/action-ros-lint@0.0.6 with: linter: xmllint package-name: | diff_drive_controller + effort_controllers forward_command_controller joint_state_controller joint_trajectory_controller position_controllers ros2_controllers + velocity_controllers ament_lint_cpp: # Linters applicable to C++ packages name: ament_${{ matrix.linter }} runs-on: ubuntu-18.04 @@ -44,13 +49,16 @@ jobs: linter: [cppcheck, cpplint, uncrustify] steps: - uses: actions/checkout@v1 - - uses: ros-tooling/setup-ros@0.0.13 - - uses: ros-tooling/action-ros-lint@0.0.5 + - uses: ros-tooling/setup-ros@0.0.26 + - uses: ros-tooling/action-ros-lint@0.0.6 with: linter: ${{ matrix.linter }} package-name: | diff_drive_controller + effort_controllers forward_command_controller joint_state_controller joint_trajectory_controller position_controllers + ros2_controllers + velocity_controllers \ No newline at end of file