From cddcd84056ff2f48b62b0a3044e00d7912ff9d13 Mon Sep 17 00:00:00 2001 From: Tomas Baca Date: Tue, 3 Oct 2023 14:23:54 +0200 Subject: [PATCH 1/3] fixing compilation on arm --- .github/workflows/ros_build_test.yml | 19 +++++++++++++++++++ CMakeLists.txt | 5 +++-- .../motor_prop_model_plugin.cpp | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/ros_build_test.yml diff --git a/.github/workflows/ros_build_test.yml b/.github/workflows/ros_build_test.yml new file mode 100644 index 0000000..994cbbf --- /dev/null +++ b/.github/workflows/ros_build_test.yml @@ -0,0 +1,19 @@ +name: ros_package_build + +on: + + push: + branches: [ testing ] + + workflow_dispatch: + +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + +jobs: + + build: + uses: ctu-mrs/ci_scripts/.github/workflows/ros_build_test.yml@master + secrets: + PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }} diff --git a/CMakeLists.txt b/CMakeLists.txt index f78df94..1cb7828 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -347,8 +347,9 @@ target_link_libraries(MrsGazeboCommonResources_FluidResistancePlugin # MotorSpeedRepublisherPlugin -add_library(MrsGazeboCommonResources_MotorSpeedRepublisherPlugin - SHARED src/sensor_and_model_plugins/motor_speed_republisher.cpp +add_library(MrsGazeboCommonResources_MotorSpeedRepublisherPlugin SHARED + src/sensor_and_model_plugins/motor_speed_republisher.cpp + ${SEN_PROTO_SRCS} ) target_link_libraries(MrsGazeboCommonResources_MotorSpeedRepublisherPlugin diff --git a/src/physics_plugins/motor_prop_model_plugin.cpp b/src/physics_plugins/motor_prop_model_plugin.cpp index 5a50385..44edab1 100644 --- a/src/physics_plugins/motor_prop_model_plugin.cpp +++ b/src/physics_plugins/motor_prop_model_plugin.cpp @@ -19,7 +19,7 @@ */ -#include "motor_prop_model.h" +#include #include namespace gazebo { From f99e8f01c56b9cbede97cb605eee1aa3690665d0 Mon Sep 17 00:00:00 2001 From: Tomas Baca Date: Tue, 3 Oct 2023 14:28:15 +0200 Subject: [PATCH 2/3] changed to devel branch --- .github/workflows/ros_build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ros_build_test.yml b/.github/workflows/ros_build_test.yml index 994cbbf..e407143 100644 --- a/.github/workflows/ros_build_test.yml +++ b/.github/workflows/ros_build_test.yml @@ -3,7 +3,7 @@ name: ros_package_build on: push: - branches: [ testing ] + branches: [ devel ] workflow_dispatch: From a741e2649816d00bcf5a8e7335f1af0cdae73233 Mon Sep 17 00:00:00 2001 From: Tomas Baca Date: Tue, 3 Oct 2023 14:30:01 +0200 Subject: [PATCH 3/3] renamed workflow --- .github/workflows/ros_build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ros_build_test.yml b/.github/workflows/ros_build_test.yml index e407143..b01a8fa 100644 --- a/.github/workflows/ros_build_test.yml +++ b/.github/workflows/ros_build_test.yml @@ -1,4 +1,4 @@ -name: ros_package_build +name: ros_build_test on: