Skip to content

Commit

Permalink
[CI] Update coverage workflows and some cleanup (#819)
Browse files Browse the repository at this point in the history
* Add CI coverage jobs for humble and iron

* Add all packages to source build

* Update repos files

* Build ros-control packages from source

* use humble job names

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>

---------

Co-authored-by: Bence Magyar <bence.magyar.robotics@gmail.com>
(cherry picked from commit 232154d)
  • Loading branch information
christophfroehlich authored and mergify[bot] committed Nov 11, 2023
1 parent d7e7aad commit 7c91cf5
Show file tree
Hide file tree
Showing 6 changed files with 150 additions and 14 deletions.
65 changes: 65 additions & 0 deletions .github/workflows/ci-coverage-build-humble.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: Coverage Build - Humble
on:
workflow_dispatch:
push:
branches:
- humble
pull_request:
branches:
- humble

jobs:
coverage:
name: coverage build
runs-on: ubuntu-22.04
strategy:
fail-fast: false
env:
ROS_DISTRO: humble
steps:
- uses: ros-tooling/setup-ros@0.7.0
with:
required-ros-distributions: ${{ env.ROS_DISTRO }}
- uses: actions/checkout@v4
- uses: ros-tooling/action-ros-ci@0.3.4
with:
target-ros2-distro: ${{ env.ROS_DISTRO }}
import-token: ${{ secrets.GITHUB_TOKEN }}
# build all packages listed here
package-name:
ackermann_steering_controller
admittance_controller
bicycle_steering_controller
diff_drive_controller
effort_controllers
force_torque_sensor_broadcaster
forward_command_controller
gripper_controllers
imu_sensor_broadcaster
joint_state_broadcaster
joint_trajectory_controller
position_controllers
range_sensor_broadcaster
steering_controllers_library
tricycle_controller
tricycle_steering_controller
velocity_controllers

vcs-repo-file-url: |
https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ros2_controllers.${{ env.ROS_DISTRO }}.repos?token=${{ secrets.GITHUB_TOKEN }}
colcon-defaults: |
{
"build": {
"mixin": ["coverage-gcc"]
}
}
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
- uses: codecov/codecov-action@v3.1.4
with:
file: ros_ws/lcov/total_coverage.info
flags: unittests
name: codecov-umbrella
- uses: actions/upload-artifact@v3.1.3
with:
name: colcon-logs-coverage-humble
path: ros_ws/log
65 changes: 65 additions & 0 deletions .github/workflows/ci-coverage-build-iron.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: Coverage Build - Iron
on:
workflow_dispatch:
push:
branches:
- iron
pull_request:
branches:
- iron

jobs:
coverage:
name: coverage build
runs-on: ubuntu-22.04
strategy:
fail-fast: false
env:
ROS_DISTRO: iron
steps:
- uses: ros-tooling/setup-ros@0.7.0
with:
required-ros-distributions: ${{ env.ROS_DISTRO }}
- uses: actions/checkout@v4
- uses: ros-tooling/action-ros-ci@0.3.4
with:
target-ros2-distro: ${{ env.ROS_DISTRO }}
import-token: ${{ secrets.GITHUB_TOKEN }}
# build all packages listed here
package-name:
ackermann_steering_controller
admittance_controller
bicycle_steering_controller
diff_drive_controller
effort_controllers
force_torque_sensor_broadcaster
forward_command_controller
gripper_controllers
imu_sensor_broadcaster
joint_state_broadcaster
joint_trajectory_controller
position_controllers
range_sensor_broadcaster
steering_controllers_library
tricycle_controller
tricycle_steering_controller
velocity_controllers

vcs-repo-file-url: |
https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ros2_controllers.${{ env.ROS_DISTRO }}.repos?token=${{ secrets.GITHUB_TOKEN }}
colcon-defaults: |
{
"build": {
"mixin": ["coverage-gcc"]
}
}
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
- uses: codecov/codecov-action@v3.1.4
with:
file: ros_ws/lcov/total_coverage.info
flags: unittests
name: codecov-umbrella
- uses: actions/upload-artifact@v3.1.3
with:
name: colcon-logs-coverage-iron
path: ros_ws/log
2 changes: 1 addition & 1 deletion .github/workflows/ci-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
velocity_controllers

vcs-repo-file-url: |
https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ros2_controllers-not-released.${{ env.ROS_DISTRO }}.repos?token=${{ secrets.GITHUB_TOKEN }}
https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ros2_controllers.${{ env.ROS_DISTRO }}.repos?token=${{ secrets.GITHUB_TOKEN }}
colcon-defaults: |
{
"build": {
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/reusable-ros-tooling-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,26 @@ jobs:
ref: ${{ inputs.ref }}
# build all packages listed in the meta package
package-name:
ackermann_steering_controller
admittance_controller
bicycle_steering_controller
diff_drive_controller
effort_controllers
force_torque_sensor_broadcaster
forward_command_controller
gripper_controllers
imu_sensor_broadcaster
joint_state_broadcaster
joint_trajectory_controller
position_controllers
range_sensor_broadcaster
ros2_controllers
ros2_controllers_test_nodes
rqt_joint_trajectory_controller
steering_controllers_library
tricycle_controller
tricycle_steering_controller
velocity_controllers

vcs-repo-file-url: |
https://raw.githubusercontent.com/ros2/ros2/${{ inputs.ros2_repo_branch }}/ros2.repos
Expand Down
8 changes: 0 additions & 8 deletions ros2_controllers.iron.repos
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,3 @@ repositories:
type: git
url: https://github.com/ros-controls/kinematics_interface.git
version: master
angles:
type: git
url: https://github.com/ros/angles.git
version: ros2
generate_parameter_library:
type: git
url: https://github.com/picknikrobotics/generate_parameter_library.git
version: main
5 changes: 0 additions & 5 deletions ros2_controllers.rolling.repos
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,10 @@ repositories:
type: git
url: https://github.com/ros-controls/control_toolbox.git
version: ros2-master

kinematics_interface:
type: git
url: https://github.com/ros-controls/kinematics_interface.git
version: master
angles:
type: git
url: https://github.com/ros/angles.git
version: ros2
generate_parameter_library:
type: git
url: https://github.com/picknikrobotics/generate_parameter_library.git
Expand Down

0 comments on commit 7c91cf5

Please sign in to comment.