From 095d4a8e8e042d19ea82fe597e1718efbd0cbb30 Mon Sep 17 00:00:00 2001 From: rafal-gorecki <126687345+rafal-gorecki@users.noreply.github.com> Date: Thu, 11 Jan 2024 11:55:17 +0100 Subject: [PATCH 1/4] Update rosbot_hardware.repos --- rosbot/rosbot_hardware.repos | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rosbot/rosbot_hardware.repos b/rosbot/rosbot_hardware.repos index 1d9e14c7..d94215af 100644 --- a/rosbot/rosbot_hardware.repos +++ b/rosbot/rosbot_hardware.repos @@ -6,18 +6,18 @@ repositories: ros_components_description: type: git url: https://github.com/husarion/ros_components_description.git - version: gazebo-ignition-multirobots + version: ros2 rosbot_controllers: type: git url: https://github.com/husarion/rosbot_controllers - version: update-params + version: main # Waiting for backporting to the humble version # https://github.com/ros-controls/ros2_controllers/pull/726 and # https://github.com/ros-controls/ros2_controllers/pull/831 ros2_controllers: type: git url: https://github.com/delihus/ros2_controllers - version: imu-sensor-broadcaster-features + version: humble micro_ros_msgs: type: git url: https://github.com/micro-ROS/micro_ros_msgs.git From c2c27ac98ff3662cdd0c5322f74b66192e97da16 Mon Sep 17 00:00:00 2001 From: rafal-gorecki <126687345+rafal-gorecki@users.noreply.github.com> Date: Thu, 11 Jan 2024 11:56:11 +0100 Subject: [PATCH 2/4] Update rosbot_simulation.repos --- rosbot/rosbot_simulation.repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosbot/rosbot_simulation.repos b/rosbot/rosbot_simulation.repos index 3fedb2c5..40ba729f 100644 --- a/rosbot/rosbot_simulation.repos +++ b/rosbot/rosbot_simulation.repos @@ -7,4 +7,4 @@ repositories: husarion/husarion_office_gz: type: git url: https://github.com/husarion/husarion_office_gz - version: add-gazebo-plugins + version: main From 1b93658515cef0854024b9e3758a84f42eb81ecc Mon Sep 17 00:00:00 2001 From: Jakub Delicat <109142865+delihus@users.noreply.github.com> Date: Thu, 11 Jan 2024 14:19:49 +0100 Subject: [PATCH 3/4] Update .github/workflows/industrial_ci.yaml Co-authored-by: rafal-gorecki <126687345+rafal-gorecki@users.noreply.github.com> --- .github/workflows/industrial_ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/industrial_ci.yaml b/.github/workflows/industrial_ci.yaml index bdd815b7..51fb5b1c 100644 --- a/.github/workflows/industrial_ci.yaml +++ b/.github/workflows/industrial_ci.yaml @@ -29,7 +29,7 @@ jobs: ros_industrial_ci: name: ROS Industrial CI runs-on: ubuntu-22.04 - timeout-minutes: 60 + timeout-minutes: 30 needs: - black - spellcheck From f300449168744ff63313a7680b73f83e55ea62af Mon Sep 17 00:00:00 2001 From: Jakub Delicat <109142865+delihus@users.noreply.github.com> Date: Thu, 11 Jan 2024 14:20:01 +0100 Subject: [PATCH 4/4] Update .github/workflows/industrial_ci.yaml Co-authored-by: rafal-gorecki <126687345+rafal-gorecki@users.noreply.github.com> --- .github/workflows/industrial_ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/industrial_ci.yaml b/.github/workflows/industrial_ci.yaml index 51fb5b1c..eb68cd17 100644 --- a/.github/workflows/industrial_ci.yaml +++ b/.github/workflows/industrial_ci.yaml @@ -63,7 +63,7 @@ jobs: cp -r src/ros2_controllers/imu_sensor_broadcaster src/ rm -rf src/ros2_controllers - - name: Remove ign_ros2_control demo + - name: Remove ign_ros2_control demo and tests shell: bash run: rm -rf src/gazebosim/gz_ros2_control/ign_ros2_control_demos src/gazebosim/gz_ros2_control/gz_ros2_control_tests