Skip to content

Commit

Permalink
Merge branch 'iron' into mergify/bp/iron/pr-958
Browse files Browse the repository at this point in the history
  • Loading branch information
christophfroehlich committed Feb 19, 2024
2 parents e6fad3c + b10fec9 commit 900b941
Show file tree
Hide file tree
Showing 119 changed files with 931 additions and 820 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-coverage-build-humble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ jobs:
}
}
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
- uses: codecov/codecov-action@v3.1.5
- uses: codecov/codecov-action@v4.0.1
with:
file: ros_ws/lcov/total_coverage.info
flags: unittests
name: codecov-umbrella
- uses: actions/upload-artifact@v4.3.0
- uses: actions/upload-artifact@v4.3.1
with:
name: colcon-logs-coverage-humble
path: ros_ws/log
4 changes: 2 additions & 2 deletions .github/workflows/ci-coverage-build-iron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ jobs:
}
}
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
- uses: codecov/codecov-action@v3.1.5
- uses: codecov/codecov-action@v4.0.1
with:
file: ros_ws/lcov/total_coverage.info
flags: unittests
name: codecov-umbrella
- uses: actions/upload-artifact@v4.3.0
- uses: actions/upload-artifact@v4.3.1
with:
name: colcon-logs-coverage-iron
path: ros_ws/log
4 changes: 2 additions & 2 deletions .github/workflows/ci-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ jobs:
}
}
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
- uses: codecov/codecov-action@v3.1.5
- uses: codecov/codecov-action@v4.0.1
with:
file: ros_ws/lcov/total_coverage.info
flags: unittests
name: codecov-umbrella
- uses: actions/upload-artifact@v4.3.0
- uses: actions/upload-artifact@v4.3.1
with:
name: colcon-logs-coverage-rolling
path: ros_ws/log
2 changes: 1 addition & 1 deletion .github/workflows/ci-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
python-version: '3.10'
- name: Install system hooks
run: sudo apt install -qq clang-format-14 cppcheck
- uses: pre-commit/action@v3.0.0
- uses: pre-commit/action@v3.0.1
with:
extra_args: --all-files --hook-stage manual
27 changes: 27 additions & 0 deletions .github/workflows/humble-binary-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Humble Binary Build
# author: Denis Štogl <denis@stoglrobotics.de>
# description: 'Build & test all dependencies from released (binary) packages.'

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

jobs:
binary:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
strategy:
matrix:
ROS_REPO: [main, testing]
with:
ros_distro: humble
ros_repo: ${{ matrix.ROS_REPO }}
upstream_workspace: ros2_controllers-not-released.humble.repos
ref_for_scheduled_build: humble
20 changes: 20 additions & 0 deletions .github/workflows/humble-debian-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Debian Humble Build
on:
workflow_dispatch:
pull_request:
branches:
- humble
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 1 * * *'


jobs:
humble_debian:
name: Humble debian build
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
with:
ros_distro: humble
upstream_workspace: ros2_controllers.humble.repos
ref_for_scheduled_build: humble
skip_packages: rqt_joint_trajectory_controller
19 changes: 19 additions & 0 deletions .github/workflows/humble-rhel-semi-binary-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: RHEL Humble Binary Build
on:
workflow_dispatch:
pull_request:
branches:
- humble
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 1 * * *'

jobs:
humble_rhel_binary:
name: Humble RHEL binary build
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
with:
ros_distro: humble
upstream_workspace: ros2_controllers.humble.repos
ref_for_scheduled_build: humble
skip_packages: rqt_joint_trajectory_controller
26 changes: 26 additions & 0 deletions .github/workflows/humble-semi-binary-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Humble Semi-Binary Build
# description: 'Build & test that compiles the main dependencies from source.'

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

jobs:
semi_binary:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
strategy:
matrix:
ROS_REPO: [main, testing]
with:
ros_distro: humble
ros_repo: ${{ matrix.ROS_REPO }}
upstream_workspace: ros2_controllers.humble.repos
ref_for_scheduled_build: humble
17 changes: 17 additions & 0 deletions .github/workflows/humble-source-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Humble Source Build
on:
workflow_dispatch:
push:
branches:
- humble
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 3 * * *'

jobs:
source:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
with:
ros_distro: humble
ref: humble
ros2_repo_branch: humble
30 changes: 0 additions & 30 deletions .github/workflows/iron-binary-build-testing.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Iron Binary Build - main
name: Iron Binary Build
# author: Denis Štogl <denis@stoglrobotics.de>
# description: 'Build & test all dependencies from released (binary) packages.'

Expand All @@ -22,9 +22,12 @@ on:

jobs:
binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
strategy:
matrix:
ROS_REPO: [main, testing]
with:
ros_distro: iron
ros_repo: main
ros_repo: ${{ matrix.ROS_REPO }}
upstream_workspace: ros2_controllers-not-released.iron.repos
ref_for_scheduled_build: iron
20 changes: 20 additions & 0 deletions .github/workflows/iron-debian-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Debian Iron Build
on:
workflow_dispatch:
pull_request:
branches:
- iron
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 1 * * *'


jobs:
iron_debian:
name: Iron debian build
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
with:
ros_distro: iron
upstream_workspace: ros2_controllers.iron.repos
ref_for_scheduled_build: iron
skip_packages: rqt_joint_trajectory_controller
28 changes: 0 additions & 28 deletions .github/workflows/iron-rhel-binary-build.yml

This file was deleted.

20 changes: 20 additions & 0 deletions .github/workflows/iron-rhel-semi-binary-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: RHEL Iron Binary Build
on:
workflow_dispatch:
pull_request:
branches:
- iron
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 1 * * *'


jobs:
iron_rhel_binary:
name: Iron RHEL binary build
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
with:
ros_distro: iron
upstream_workspace: ros2_controllers.iron.repos
ref_for_scheduled_build: iron
skip_packages: rqt_joint_trajectory_controller
29 changes: 0 additions & 29 deletions .github/workflows/iron-semi-binary-build-main.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Iron Semi-Binary Build - testing
name: Iron Semi-Binary Build
# description: 'Build & test that compiles the main dependencies from source.'

on:
Expand All @@ -21,9 +21,12 @@ on:

jobs:
semi_binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
strategy:
matrix:
ROS_REPO: [main, testing]
with:
ros_distro: iron
ros_repo: testing
ros_repo: ${{ matrix.ROS_REPO }}
upstream_workspace: ros2_controllers.iron.repos
ref_for_scheduled_build: iron
2 changes: 1 addition & 1 deletion .github/workflows/iron-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
source:
uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
with:
ros_distro: iron
ref: iron
Expand Down
Loading

0 comments on commit 900b941

Please sign in to comment.