Skip to content

Commit a71cd38

Browse files
Use reusable workflows from ros2_control_ci and cleanup
1 parent 1c166c1 commit a71cd38

22 files changed

+109
-436
lines changed

.github/workflows/ci-coverage-build.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Coverage Build
22
on:
33
workflow_dispatch:
4-
branches:
5-
- master
64
pull_request:
75
branches:
86
- master

.github/workflows/humble-binary-build.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ on:
1616

1717
jobs:
1818
binary:
19-
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
19+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
2020
strategy:
21+
fail-fast: false
2122
matrix:
23+
ROS_DISTRO: [humble]
2224
ROS_REPO: [main, testing]
2325
with:
24-
ros_distro: humble
26+
ros_distro: ${{ matrix.ROS_DISTRO }}
2527
ros_repo: ${{ matrix.ROS_REPO }}
26-
upstream_workspace: kinematics_interface-not-released.humble.repos
27-
ref_for_scheduled_build: humble
28+
upstream_workspace: kinematics_interface-not-released.${{ matrix.ROS_DISTRO }}.repos
29+
ref_for_scheduled_build: master

.github/workflows/humble-debian-build.yml

+10-19
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,13 @@ on:
1010

1111

1212
jobs:
13-
humble_debian:
14-
name: Humble debian build
15-
runs-on: ubuntu-latest
16-
env:
17-
ROS_DISTRO: humble
18-
container: ghcr.io/ros-controls/ros:humble-debian
19-
steps:
20-
- uses: actions/checkout@v4
21-
with:
22-
path: src/kinematics_interface
23-
ref: ${{ github.event_name == 'schedule' && 'humble' || '' }}
24-
- name: Build and test
25-
shell: bash
26-
run: |
27-
source /opt/ros2_ws/install/setup.bash
28-
vcs import src < src/kinematics_interface/kinematics_interface.${{ env.ROS_DISTRO }}.repos
29-
colcon build --packages-up-to kinematics_interface kinematics_interface_kdl
30-
colcon test --packages-select kinematics_interface kinematics_interface_kdl
31-
colcon test-result --verbose
13+
debian_source_build:
14+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
ROS_DISTRO: [humble]
19+
with:
20+
ros_distro: ${{ matrix.ROS_DISTRO }}
21+
upstream_workspace: kinematics_interface.${{ matrix.ROS_DISTRO }}.repos
22+
ref_for_scheduled_build: master

.github/workflows/humble-rhel-binary-build.yml

-33
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: RHEL Humble Semi-Binary Build
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches:
6+
- humble
7+
schedule:
8+
# Run every day to detect flakiness and broken dependencies
9+
- cron: '42 4 * * *'
10+
11+
jobs:
12+
rhel_semi_binary_build:
13+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
ROS_DISTRO: [humble]
18+
with:
19+
ros_distro: ${{ matrix.ROS_DISTRO }}
20+
upstream_workspace: kinematics_interface.${{ matrix.ROS_DISTRO }}.repos
21+
ref_for_scheduled_build: master

.github/workflows/humble-semi-binary-build.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ on:
1515

1616
jobs:
1717
semi_binary:
18-
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
18+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
1919
strategy:
20+
fail-fast: false
2021
matrix:
22+
ROS_DISTRO: [humble]
2123
ROS_REPO: [main, testing]
2224
with:
23-
ros_distro: humble
25+
ros_distro: ${{ matrix.ROS_DISTRO }}
2426
ros_repo: ${{ matrix.ROS_REPO }}
25-
upstream_workspace: kinematics_interface.humble.repos
26-
ref_for_scheduled_build: humble
27+
upstream_workspace: kinematics_interface.${{ matrix.ROS_DISTRO }}.repos
28+
ref_for_scheduled_build: master

.github/workflows/humble-source-build.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@ on:
1010

1111
jobs:
1212
source:
13-
uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
13+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
ROS_DISTRO: [humble]
1418
with:
15-
ros_distro: humble
16-
ref: humble
17-
ros2_repo_branch: humble
19+
ros_distro: ${{ matrix.ROS_DISTRO }}
20+
ref: master
21+
ros2_repo_branch: ${{ matrix.ROS_DISTRO }}

.github/workflows/iron-abi-compatibility.yml

-18
This file was deleted.

.github/workflows/iron-binary-build.yml

-27
This file was deleted.

.github/workflows/iron-debian-build.yml

-32
This file was deleted.

.github/workflows/iron-rhel-binary-build.yml

-35
This file was deleted.

.github/workflows/iron-semi-binary-build.yml

-26
This file was deleted.

.github/workflows/iron-source-build.yml

-17
This file was deleted.

0 commit comments

Comments
 (0)