Skip to content

Commit 64746a0

Browse files
christophfroehlichmergify[bot]
authored andcommitted
Branch off for jazzy (#880)
(cherry picked from commit a7ae85f)
1 parent fc26456 commit 64746a0

13 files changed

+206
-11
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ updates:
1111
directory: "/"
1212
schedule:
1313
interval: "weekly"
14+
- package-ecosystem: "github-actions"
15+
# Workflow files stored in the
16+
# default location of `.github/workflows`
17+
directory: "/"
18+
schedule:
19+
interval: "weekly"
20+
target-branch: "jazzy"
1421
- package-ecosystem: "github-actions"
1522
# Workflow files stored in the
1623
# default location of `.github/workflows`

.github/mergify.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ pull_request_rules:
88
branches:
99
- humble
1010

11+
- name: Backport to jazzy at reviewers discretion
12+
conditions:
13+
- base=master
14+
- "label=backport-jazzy"
15+
actions:
16+
backport:
17+
branches:
18+
- jazzy
19+
1120
- name: Ask to resolve conflict
1221
conditions:
1322
- conflict
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Jazzy Binary Build
2+
# author: Denis Štogl <[email protected]>
3+
# description: 'Build & test all dependencies from released (binary) packages.'
4+
5+
on:
6+
pull_request:
7+
branches:
8+
- jazzy
9+
paths:
10+
- '**.hpp'
11+
- '**.cpp'
12+
- '.github/workflows/jazzy-binary-build.yml'
13+
- '**/package.xml'
14+
- '**/CMakeLists.txt'
15+
- '**.xacro'
16+
- '**.py'
17+
- '**.yaml'
18+
- 'ros2_control_demos-not-released.jazzy.repos'
19+
- '**.xml'
20+
push:
21+
branches:
22+
- jazzy
23+
paths:
24+
- '**.hpp'
25+
- '**.cpp'
26+
- '.github/workflows/jazzy-binary-build.yml'
27+
- '**/package.xml'
28+
- '**/CMakeLists.txt'
29+
- '**.xacro'
30+
- '**.py'
31+
- '**.yaml'
32+
- 'ros2_control_demos-not-released.jazzy.repos'
33+
- '**.xml'
34+
schedule:
35+
# Run every morning to detect flakiness and broken dependencies
36+
- cron: '03 1 * * MON-FRI'
37+
38+
jobs:
39+
binary:
40+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
41+
strategy:
42+
fail-fast: false
43+
matrix:
44+
ROS_REPO: [main, testing]
45+
with:
46+
ros_distro: jazzy
47+
ros_repo: ${{ matrix.ROS_REPO }}
48+
upstream_workspace: ros2_control_demos-not-released.jazzy.repos
49+
ref_for_scheduled_build: jazzy
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Jazzy Check Docs
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches:
7+
- jazzy
8+
paths:
9+
- '**.rst'
10+
- '**.md'
11+
- '**.jpg'
12+
- '**.jpeg'
13+
- '**.png'
14+
- '**.svg'
15+
- '**.yml'
16+
- '**.yaml'
17+
- '!.github/**' # exclude yaml files in .github directory
18+
- '.github/workflows/jazzy-check-docs.yml'
19+
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.ref }}
22+
cancel-in-progress: true
23+
24+
jobs:
25+
check-docs:
26+
name: Check Docs
27+
uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@jazzy
28+
with:
29+
ROS2_CONTROL_DEMOS_PR: ${{ github.ref }}
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Build Jazzy Dockerfile
2+
# description: builds the dockerfile contained within the repo
3+
4+
on:
5+
pull_request:
6+
branches:
7+
- jazzy
8+
paths:
9+
- '**.hpp'
10+
- '**.cpp'
11+
- Dockerfile/**
12+
- '.github/workflows/jazzy-docker-build.yml'
13+
- '**/package.xml'
14+
- '**/CMakeLists.txt'
15+
- '**.xacro'
16+
- '**.py'
17+
- '**.yaml'
18+
- 'ros2_control_demos.jazzy.repos'
19+
push:
20+
branches:
21+
- jazzy
22+
paths:
23+
- '**.hpp'
24+
- '**.cpp'
25+
- Dockerfile/**
26+
- '.github/workflows/jazzy-docker-build.yml'
27+
- '**/package.xml'
28+
- '**/CMakeLists.txt'
29+
- '**.xacro'
30+
- '**.py'
31+
- '**.yaml'
32+
- 'ros2_control_demos.jazzy.repos'
33+
schedule:
34+
# Run every morning to detect broken dependencies
35+
- cron: '40 1 * * MON-FRI'
36+
37+
38+
jobs:
39+
build:
40+
runs-on: ubuntu-latest
41+
steps:
42+
- uses: actions/checkout@v5
43+
with:
44+
ref: jazzy
45+
- name: Build the Docker image
46+
run: docker build --file Dockerfile/Dockerfile --tag ros2_control_demos_jazzy --build-arg ROS_DISTRO=jazzy .
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Pre-Commit - Jazzy
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches:
7+
- jazzy
8+
push:
9+
branches:
10+
- jazzy
11+
12+
jobs:
13+
pre-commit:
14+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
15+
with:
16+
ros_distro: jazzy
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Jazzy Semi-Binary Build
2+
# description: 'Build & test that compiles the main dependencies from source.'
3+
4+
on:
5+
pull_request:
6+
branches:
7+
- jazzy
8+
paths:
9+
- '**.hpp'
10+
- '**.cpp'
11+
- '.github/workflows/jazzy-semi-binary-build.yml'
12+
- '**/package.xml'
13+
- '**/CMakeLists.txt'
14+
- '**.xacro'
15+
- '**.py'
16+
- '**.yaml'
17+
- 'ros2_control_demos.jazzy.repos'
18+
- '**.xml'
19+
push:
20+
branches:
21+
- jazzy
22+
paths:
23+
- '**.hpp'
24+
- '**.cpp'
25+
- '.github/workflows/jazzy-semi-binary-build.yml'
26+
- '**/package.xml'
27+
- '**/CMakeLists.txt'
28+
- '**.xacro'
29+
- '**.py'
30+
- '**.yaml'
31+
- 'ros2_control_demos.jazzy.repos'
32+
- '**.xml'
33+
schedule:
34+
# Run every morning to detect flakiness and broken dependencies
35+
- cron: '33 1 * * MON-FRI'
36+
37+
jobs:
38+
semi_binary:
39+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
40+
with:
41+
ros_distro: jazzy
42+
ros_repo: testing
43+
upstream_workspace: ros2_control_demos.jazzy.repos
44+
ref_for_scheduled_build: jazzy

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
ROS_DISTRO: [rolling, kilted, jazzy]
44+
ROS_DISTRO: [rolling, kilted]
4545
ROS_REPO: [main, testing]
4646
with:
4747
ros_distro: ${{ matrix.ROS_DISTRO }}

.github/workflows/rolling-check-docs.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,8 @@ concurrency:
2222
cancel-in-progress: true
2323

2424
jobs:
25-
check-docs-rolling:
25+
check-docs:
2626
name: Check Docs
2727
uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@rolling
2828
with:
2929
ROS2_CONTROL_DEMOS_PR: ${{ github.ref }}
30-
check-docs-jazzy:
31-
name: Check Docs
32-
uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@jazzy
33-
with:
34-
ROS2_CONTROL_DEMOS_PR: ${{ github.ref }}

.github/workflows/rolling-docker-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
ROS_DISTRO: [rolling, kilted, jazzy]
44+
ROS_DISTRO: [rolling, kilted]
4545
steps:
4646
- uses: actions/checkout@v5
4747
with:

0 commit comments

Comments
 (0)