Skip to content

Commit

Permalink
Merge branch 'master' into jtc/action_tolerances
Browse files Browse the repository at this point in the history
  • Loading branch information
christophfroehlich authored Nov 15, 2023
2 parents 6a95acb + 3fc0f50 commit 4a3ba8b
Show file tree
Hide file tree
Showing 97 changed files with 861 additions and 362 deletions.
10 changes: 10 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ pull_request_rules:
branches:
- humble


- name: Backport to iron at reviewers discretion
conditions:
- base=master
- "label=backport-iron"
actions:
backport:
branches:
- iron

- name: Ask to resolve conflict
conditions:
- conflict
Expand Down
22 changes: 0 additions & 22 deletions .github/workflows/README.md

This file was deleted.

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/[email protected]
with:
required-ros-distributions: ${{ env.ROS_DISTRO }}
- uses: actions/checkout@v4
- uses: ros-tooling/[email protected]
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/[email protected]
with:
file: ros_ws/lcov/total_coverage.info
flags: unittests
name: codecov-umbrella
- uses: actions/[email protected]
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/[email protected]
with:
required-ros-distributions: ${{ env.ROS_DISTRO }}
- uses: actions/checkout@v4
- uses: ros-tooling/[email protected]
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/[email protected]
with:
file: ros_ws/lcov/total_coverage.info
flags: unittests
name: codecov-umbrella
- uses: actions/[email protected]
with:
name: colcon-logs-coverage-iron
path: ros_ws/log
24 changes: 19 additions & 5 deletions .github/workflows/ci-coverage-build.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Coverage Build
on:
workflow_dispatch:
branches:
- master
push:
branches:
- master
Expand All @@ -23,16 +21,32 @@ jobs:
with:
required-ros-distributions: ${{ env.ROS_DISTRO }}
- uses: actions/checkout@v4
- uses: ros-tooling/[email protected].3
- uses: ros-tooling/[email protected].4
with:
target-ros2-distro: ${{ env.ROS_DISTRO }}
import-token: ${{ secrets.GITHUB_TOKEN }}
# build all packages listed in the meta package
# 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-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
20 changes: 20 additions & 0 deletions .github/workflows/iron-abi-compatibility.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Iron - ABI Compatibility Check
on:
workflow_dispatch:
branches:
- iron
pull_request:
branches:
- iron

jobs:
abi_check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ros-industrial/industrial_ci@master
env:
ROS_DISTRO: iron
ROS_REPO: main
ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
NOT_TEST_BUILD: true
30 changes: 30 additions & 0 deletions .github/workflows/iron-binary-build-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Iron Binary Build - main
# author: Denis Štogl <[email protected]>
# description: 'Build & test all dependencies from released (binary) packages.'

on:
workflow_dispatch:
branches:
- iron
- '*feature*'
- '*feature/**'
pull_request:
branches:
- iron
- '*feature*'
- '*feature/**'
push:
branches:
- iron
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'

jobs:
binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: iron
ros_repo: main
upstream_workspace: ros2_controllers-not-released.iron.repos
ref_for_scheduled_build: iron
30 changes: 30 additions & 0 deletions .github/workflows/iron-binary-build-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Iron Binary Build - testing
# author: Denis Štogl <[email protected]>
# description: 'Build & test all dependencies from released (binary) packages.'

on:
workflow_dispatch:
branches:
- iron
- '*feature*'
- '*feature/**'
pull_request:
branches:
- iron
- '*feature*'
- '*feature/**'
push:
branches:
- iron
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'

jobs:
binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: iron
ros_repo: testing
upstream_workspace: ros2_controllers-not-released.iron.repos
ref_for_scheduled_build: iron
28 changes: 28 additions & 0 deletions .github/workflows/iron-rhel-binary-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Iron RHEL Binary Build
on:
workflow_dispatch:
push:
branches:
- iron
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 1 * * *'


jobs:
iron_rhel_binary:
name: Iron RHEL binary build
runs-on: ubuntu-latest
env:
ROS_DISTRO: iron
container: ghcr.io/ros-controls/ros:iron-rhel
steps:
- uses: actions/checkout@v4
with:
path: src/ros2_controllers
- run: |
rosdep update
rosdep install -iy --from-path src/ros2_controllers
source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
colcon build
colcon test
29 changes: 29 additions & 0 deletions .github/workflows/iron-semi-binary-build-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Iron Semi-Binary Build - main
# description: 'Build & test that compiles the main dependencies from source.'

on:
workflow_dispatch:
branches:
- iron
- '*feature*'
- '*feature/**'
pull_request:
branches:
- iron
- '*feature*'
- '*feature/**'
push:
branches:
- iron
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '33 1 * * *'

jobs:
semi_binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: iron
ros_repo: main
upstream_workspace: ros2_controllers.iron.repos
ref_for_scheduled_build: iron
29 changes: 29 additions & 0 deletions .github/workflows/iron-semi-binary-build-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Iron Semi-Binary Build - testing
# description: 'Build & test that compiles the main dependencies from source.'

on:
workflow_dispatch:
branches:
- iron
- '*feature*'
- '*feature/**'
pull_request:
branches:
- iron
- '*feature*'
- '*feature/**'
push:
branches:
- iron
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '33 1 * * *'

jobs:
semi_binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: iron
ros_repo: testing
upstream_workspace: ros2_controllers.iron.repos
ref_for_scheduled_build: iron
Loading

0 comments on commit 4a3ba8b

Please sign in to comment.