Skip to content

Commit

Permalink
Merge branch 'master' into feature/steering_controllers_library_wait_…
Browse files Browse the repository at this point in the history
…steering
  • Loading branch information
christophfroehlich authored Dec 16, 2024
2 parents 2de1d31 + c9c8343 commit 954c9f2
Show file tree
Hide file tree
Showing 141 changed files with 1,746 additions and 411 deletions.
3 changes: 2 additions & 1 deletion .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ pull_request_rules:
- author=mergify[bot]
actions:
comment:
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich?
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?

- name: development targets master branch
conditions:
- base!=master
- author!=bmagyar
- author!=destogl
- author!=christophfroehlich
- author!=saikishor
- author!=mergify[bot]
- author!=dependabot[bot]
actions:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/humble-abi-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ on:
- '**/CMakeLists.txt'
- 'ros2_controllers-not-released.humble.repos'

concurrency:
# cancel previous runs of the same workflow, except for pushes on humble branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
abi_check:
runs-on: ubuntu-latest
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/humble-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ on:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'

concurrency:
# cancel previous runs of the same workflow, except for pushes on humble branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
binary:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/humble-check-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ on:
- '**.md'
- '**.yaml'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
check-docs:
name: Check Docs
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/humble-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ on:
- '**/CMakeLists.txt'
- 'ros2_controllers.humble.repos'

concurrency:
# cancel previous runs of the same workflow, except for pushes on humble branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
coverage_humble:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/humble-debian-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ on:
# Run every day to detect flakiness and broken dependencies
- cron: '03 1 * * *'

concurrency:
# cancel previous runs of the same workflow, except for pushes on humble branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
humble_debian:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/humble-pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
branches:
- humble

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
pre-commit:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/humble-rhel-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ on:
# Run every day to detect flakiness and broken dependencies
- cron: '03 1 * * *'

concurrency:
# cancel previous runs of the same workflow, except for pushes on humble branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
humble_rhel_binary:
name: Humble RHEL binary build
Expand Down
22 changes: 17 additions & 5 deletions .github/workflows/humble-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,27 @@ on:
# Run every morning to detect flakiness and broken dependencies
- cron: '33 1 * * *'

concurrency:
# cancel previous runs of the same workflow, except for pushes on humble branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
semi_binary:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
strategy:
fail-fast: false
matrix:
ROS_REPO: [testing]
with:
ros_distro: humble
ros_repo: ${{ matrix.ROS_REPO }}
ros_repo: testing
upstream_workspace: ros2_controllers.humble.repos
ref_for_scheduled_build: humble
semi_binary_clang:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
with:
ros_distro: humble
ros_repo: testing
upstream_workspace: ros2_controllers-not-released.humble.repos
ref_for_scheduled_build: humble
additional_debs: clang
c_compiler: clang
cxx_compiler: clang++
not_test_build: true
49 changes: 49 additions & 0 deletions .github/workflows/humble-semi-binary-downstream-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Humble Downstream Build
# description: 'Build & test downstream packages from source.'
# author: Christoph Froehlich <[email protected]>

on:
workflow_dispatch:
pull_request:
branches:
- humble
paths:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/humble-semi-binary-downstream-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros_controls.humble.repos'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build-downstream:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
with:
ros_distro: humble
ros_repo: testing
ref_for_scheduled_build: humble
upstream_workspace: ros2_controllers.humble.repos
# we don't test this repository, we just build it
not_test_build: true
# we test the downstream packages, which are part of our organization
downstream_workspace: ros_controls.humble.repos
not_test_downstream: false
build-downstream-3rd-party:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
with:
ros_distro: humble
ros_repo: testing
ref_for_scheduled_build: humble
upstream_workspace: ros2_controllers.humble.repos
# we don't test this repository, we just build it
not_test_build: true
# we don't test the downstream packages, which are outside of our organization
downstream_workspace: downstream.humble.repos
not_test_downstream: true
5 changes: 5 additions & 0 deletions .github/workflows/jazzy-abi-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ on:
- '**/CMakeLists.txt'
- 'ros2_controllers-not-released.jazzy.repos'

concurrency:
# cancel previous runs of the same workflow, except for pushes on master branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
abi_check:
runs-on: ubuntu-latest
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/jazzy-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ on:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'

concurrency:
# cancel previous runs of the same workflow, except for pushes on master branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
binary:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/jazzy-check-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ on:
- '**.md'
- '**.yaml'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
check-docs:
name: Check Docs
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/jazzy-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ on:
# - '**/CMakeLists.txt'
# - 'ros2_controllers.jazzy.repos'

concurrency:
# cancel previous runs of the same workflow, except for pushes on master branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
coverage_jazzy:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/jazzy-debian-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ on:
# Run every day to detect flakiness and broken dependencies
- cron: '03 1 * * *'

concurrency:
# cancel previous runs of the same workflow, except for pushes on master branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
jazzy_debian:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/jazzy-pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
branches:
- master

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
pre-commit:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/jazzy-rhel-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ on:
# Run every day to detect flakiness and broken dependencies
- cron: '03 1 * * *'

concurrency:
# cancel previous runs of the same workflow, except for pushes on master branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
jazzy_rhel:
Expand Down
22 changes: 17 additions & 5 deletions .github/workflows/jazzy-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,27 @@ on:
# Run every morning to detect flakiness and broken dependencies
- cron: '33 1 * * *'

concurrency:
# cancel previous runs of the same workflow, except for pushes on master branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
semi_binary:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
strategy:
fail-fast: false
matrix:
ROS_REPO: [testing]
with:
ros_distro: jazzy
ros_repo: ${{ matrix.ROS_REPO }}
ros_repo: testing
upstream_workspace: ros2_controllers.jazzy.repos
ref_for_scheduled_build: master
semi_binary_clang:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
with:
ros_distro: jazzy
ros_repo: testing
upstream_workspace: ros2_controllers.jazzy.repos
ref_for_scheduled_build: jazzy
additional_debs: clang
c_compiler: clang
cxx_compiler: clang++
not_test_build: true
49 changes: 49 additions & 0 deletions .github/workflows/jazzy-semi-binary-downstream-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Jazzy Downstream Build
# description: 'Build & test downstream packages from source.'
# author: Christoph Froehlich <[email protected]>

on:
workflow_dispatch:
pull_request:
branches:
- master
paths:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/jazzy-semi-binary-downstream-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros_controls.jazzy.repos'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build-downstream:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
with:
ros_distro: jazzy
ros_repo: testing
ref_for_scheduled_build: master
upstream_workspace: ros2_controllers.jazzy.repos
# we don't test this repository, we just build it
not_test_build: true
# we test the downstream packages, which are part of our organization
downstream_workspace: ros_controls.jazzy.repos
not_test_downstream: false
build-downstream-3rd-party:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
with:
ros_distro: jazzy
ros_repo: testing
ref_for_scheduled_build: master
upstream_workspace: ros2_controllers.jazzy.repos
# we don't test this repository, we just build it
not_test_build: true
# we don't test the downstream packages, which are outside of our organization
downstream_workspace: downstream.jazzy.repos
not_test_downstream: true
5 changes: 5 additions & 0 deletions .github/workflows/rolling-abi-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ on:
- '**/CMakeLists.txt'
- 'ros2_controllers-not-released.rolling.repos'

concurrency:
# cancel previous runs of the same workflow, except for pushes on master branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
abi_check:
runs-on: ubuntu-latest
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/rolling-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ on:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'

concurrency:
# cancel previous runs of the same workflow, except for pushes on master branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}

jobs:
binary:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/rolling-check-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ on:
- '**.yaml'
- '.github/workflows/rolling-check-docs.yml'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
check-docs:
name: Check Docs
Expand Down
Loading

0 comments on commit 954c9f2

Please sign in to comment.