Skip to content

Commit

Permalink
Merge branch 'master' into 133_pr_rebase_again
Browse files Browse the repository at this point in the history
  • Loading branch information
saikishor authored Jul 23, 2024
2 parents d1beb6e + c6b2326 commit 64de775
Show file tree
Hide file tree
Showing 59 changed files with 2,124 additions and 51 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/humble-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,29 @@ on:
pull_request:
branches:
- humble
paths:
- '**.hpp'
- '**.cpp'
- '.github/workflows/humble-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos-not-released.humble.repos'
push:
branches:
- humble
paths:
- '**.hpp'
- '**.cpp'
- '.github/workflows/humble-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos-not-released.humble.repos'
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/humble-check-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Humble Check Docs

on:
workflow_dispatch:
pull_request:
branches:
- humble
paths:
- '**.rst'
- '.github/workflows/humble-check-docs.yml'

jobs:
check-docs:
name: Check Docs
uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@humble
with:
ROS2_CONTROL_DEMOS_PR: ${{ github.ref }}
1 change: 0 additions & 1 deletion .github/workflows/humble-pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ jobs:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
with:
ros_distro: humble
os_name: ubuntu-22.04
20 changes: 20 additions & 0 deletions .github/workflows/humble-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,29 @@ on:
pull_request:
branches:
- humble
paths:
- '**.hpp'
- '**.cpp'
- '.github/workflows/humble-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos.humble.repos'
push:
branches:
- humble
paths:
- '**.hpp'
- '**.cpp'
- '.github/workflows/humble-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos.humble.repos'
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '33 1 * * *'
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/iron-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,29 @@ on:
pull_request:
branches:
- iron
paths:
- '**.hpp'
- '**.cpp'
- '.github/workflows/iron-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos-not-released.iron.repos'
push:
branches:
- iron
paths:
- '**.hpp'
- '**.cpp'
- '.github/workflows/iron-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos-not-released.iron.repos'
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: Check Docs
name: Iron Check Docs

on:
workflow_dispatch:
pull_request:
branches:
- iron
paths:
- '**.rst'
- '.github/workflows/iron-check-docs.yml'

jobs:
check-docs:
name: Check Docs
uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@master
uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@iron
with:
ROS2_CONTROL_DEMOS_PR: ${{ github.ref }}
22 changes: 22 additions & 0 deletions .github/workflows/iron-docker-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,31 @@ on:
pull_request:
branches:
- iron
paths:
- '**.hpp'
- '**.cpp'
- Dockerfile/**
- '.github/workflows/iron-docker-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos.iron.repos'
push:
branches:
- iron
paths:
- '**.hpp'
- '**.cpp'
- Dockerfile/**
- '.github/workflows/iron-docker-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos.iron.repos'
schedule:
# Run every morning to detect broken dependencies
- cron: '50 1 * * *'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/iron-pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ jobs:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
with:
ros_distro: iron
os_name: ubuntu-22.04
21 changes: 21 additions & 0 deletions .github/workflows/iron-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,30 @@ on:
pull_request:
branches:
- iron
paths:
- '**.hpp'
- '**.cpp'
- '.github/workflows/iron-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos.iron.repos'
push:
branches:
- iron
paths:
- '**.hpp'
- '**.cpp'
- '.github/workflows/iron-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos.iron.repos'

schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '33 1 * * *'
Expand Down
22 changes: 21 additions & 1 deletion .github/workflows/rolling-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,29 @@ on:
pull_request:
branches:
- master
paths:
- '**.hpp'
- '**.cpp'
- '.github/workflows/rolling-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos-not-released.rolling.repos'
push:
branches:
- master
paths:
- '**.hpp'
- '**.cpp'
- '.github/workflows/rolling-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos-not-released.rolling.repos'
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'
Expand All @@ -19,7 +39,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling]
ROS_DISTRO: [rolling, jazzy]
ROS_REPO: [main, testing]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/rolling-check-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Rolling Check Docs

on:
workflow_dispatch:
pull_request:
branches:
- master
paths:
- '**.rst'
- '.github/workflows/rolling-check-docs.yml'


jobs:
check-docs-rolling:
name: Check Docs
uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@rolling
with:
ROS2_CONTROL_DEMOS_PR: ${{ github.ref }}
check-docs-jazzy:
name: Check Docs
uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@jazzy
with:
ROS2_CONTROL_DEMOS_PR: ${{ github.ref }}
28 changes: 27 additions & 1 deletion .github/workflows/rolling-docker-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,31 @@ on:
pull_request:
branches:
- master
paths:
- '**.hpp'
- '**.cpp'
- Dockerfile/**
- '.github/workflows/rolling-docker-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos.rolling.repos'
push:
branches:
- master
paths:
- '**.hpp'
- '**.cpp'
- Dockerfile/**
- '.github/workflows/rolling-docker-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos.rolling.repos'
schedule:
# Run every morning to detect broken dependencies
- cron: '50 1 * * *'
Expand All @@ -16,9 +38,13 @@ on:
jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, jazzy]
steps:
- uses: actions/checkout@v4
with:
ref: master
- name: Build the Docker image
run: docker build --file Dockerfile/Dockerfile --tag ros2_control_demos_rolling --build-arg ROS_DISTRO=rolling .
run: docker build --file Dockerfile/Dockerfile --tag ros2_control_demos_${{ matrix.ROS_DISTRO }} --build-arg ROS_DISTRO=${{ matrix.ROS_DISTRO }} .
7 changes: 5 additions & 2 deletions .github/workflows/rolling-pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ on:
jobs:
pre-commit:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, jazzy]
with:
ros_distro: rolling
container: ubuntu:24.04
ros_distro: ${{ matrix.ROS_DISTRO }}
22 changes: 21 additions & 1 deletion .github/workflows/rolling-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,29 @@ on:
pull_request:
branches:
- master
paths:
- '**.hpp'
- '**.cpp'
- '.github/workflows/rolling-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos.rolling.repos'
push:
branches:
- master
paths:
- '**.hpp'
- '**.cpp'
- '.github/workflows/rolling-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xacro'
- '**.py'
- '**.yaml'
- 'ros2_control_demos.rolling.repos'
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '33 1 * * *'
Expand All @@ -18,7 +38,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling]
ROS_DISTRO: [rolling, jazzy]
ROS_REPO: [main, testing]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
Expand Down
Loading

0 comments on commit 64de775

Please sign in to comment.