Skip to content

Commit 8508a3f

Browse files
christophfroehlichmergify[bot]
christophfroehlich
authored and
mergify[bot]
committed
Branch for jazzy (#175)
(cherry picked from commit ad756b1) # Conflicts: # .github/dependabot.yml
1 parent 7a0f006 commit 8508a3f

9 files changed

+159
-6
lines changed

‎.github/dependabot.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "github-actions"
9+
# Workflow files stored in the
10+
# default location of `.github/workflows`
11+
directory: "/"
12+
schedule:
13+
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"
21+
- package-ecosystem: "github-actions"
22+
# Workflow files stored in the
23+
# default location of `.github/workflows`
24+
directory: "/"
25+
schedule:
26+
interval: "weekly"
27+
target-branch: "humble"

‎.github/mergify.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
pull_request_rules:
2+
3+
- name: Backport to humble at reviewers discretion
4+
conditions:
5+
- base=master
6+
- "label=backport-humble"
7+
actions:
8+
backport:
9+
branches:
10+
- humble
11+
12+
- name: Backport to jazzy at reviewers discretion
13+
conditions:
14+
- base=master
15+
- "label=backport-jazzy"
16+
actions:
17+
backport:
18+
branches:
19+
- jazzy
20+
21+
- name: Ask to resolve conflict
22+
conditions:
23+
- conflict
24+
- author!=mergify[bot]
25+
- author!=dependabot[bot]
26+
actions:
27+
comment:
28+
message: This pull request is in conflict. Could you fix it @{{author}}?
29+
30+
- name: Ask to resolve conflict for backports
31+
conditions:
32+
- conflict
33+
- author=mergify[bot]
34+
actions:
35+
comment:
36+
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?
37+
38+
- name: development targets master branch
39+
conditions:
40+
- base!=master
41+
- author!=bmagyar
42+
- author!=destogl
43+
- author!=christophfroehlich
44+
- author!=saikishor
45+
- author!=mergify[bot]
46+
- author!=dependabot[bot]
47+
actions:
48+
comment:
49+
message: |
50+
@{{author}}, all pull requests must be targeted towards the `master` development branch.
51+
Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
52+
to have these changes reflected into new distributions.

‎.github/workflows/jazzy-binary-downstream-build.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Jazzy Downstream Build
2+
# description: 'Build & test downstream packages from source.'
3+
# author: Christoph Froehlich <[email protected]>
4+
5+
on:
6+
workflow_dispatch:
7+
pull_request:
8+
branches:
9+
- jazzy
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
build-downstream:
17+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
18+
with:
19+
ros_distro: jazzy
20+
ros_repo: testing
21+
ref_for_scheduled_build: jazzy
22+
not_test_build: true
23+
downstream_workspace: ros_controls.jazzy.repos
24+
not_test_downstream: true

‎.github/workflows/jazzy-build.yml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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+
workflow_dispatch:
7+
pull_request:
8+
branches:
9+
- jazzy
10+
push:
11+
branches:
12+
- jazzy
13+
schedule:
14+
# Run every morning to detect flakiness and broken dependencies
15+
- cron: '28 6 * * *'
16+
17+
concurrency:
18+
# cancel previous runs of the same workflow, except for pushes on jazzy branch
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
21+
22+
jobs:
23+
binary:
24+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
ROS_REPO: [main, testing]
29+
with:
30+
ros_distro: jazzy
31+
ros_repo: ${{ matrix.ROS_REPO }}
32+
ref_for_scheduled_build: jazzy

‎.github/workflows/jazzy-pre-commit.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Jazzy Pre-Commit
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches:
7+
- jazzy
8+
9+
concurrency:
10+
# cancel previous runs of the same workflow
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
pre-commit:
16+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
17+
with:
18+
ros_distro: jazzy

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
ROS_DISTRO: [jazzy, rolling]
21+
ROS_DISTRO: [rolling]
2222
ROS_REPO: [testing]
2323
with:
2424
ros_distro: ${{ matrix.ROS_DISTRO }}

‎.github/workflows/rolling-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
ROS_DISTRO: [jazzy, rolling]
28+
ROS_DISTRO: [rolling]
2929
ROS_REPO: [main, testing]
3030
with:
3131
ros_distro: ${{ matrix.ROS_DISTRO }}

‎.github/workflows/rolling-pre-commit.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Pre-Commit
1+
name: Rolling Pre-Commit
22

33
on:
44
workflow_dispatch:
@@ -17,6 +17,6 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
ROS_DISTRO: [jazzy, rolling]
20+
ROS_DISTRO: [rolling]
2121
with:
2222
ros_distro: ${{ matrix.ROS_DISTRO }}

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ See [control_msgs documentation](https://index.ros.org/p/control_msgs/) on index
1212
|--------------|-----------------|--------------|
1313
| Noetic | [kinetic-devel](https://github.com/ros-controls/control_msgs/tree/kinetic-devel) | [Build status](https://travis-ci.org/ros-controls/control_msgs) |
1414
| Humble | [humble](https://github.com/ros-controls/control_msgs/tree/humble) | [![Humble Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/humble-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/humble-build.yml) |
15-
| Jazzy | [master](https://github.com/ros-controls/control_msgs/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml) |
16-
| Rolling | [master](https://github.com/ros-controls/control_msgs/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml) |
15+
| Jazzy | [jazzy](https://github.com/ros-controls/control_msgs/tree/jazzy) | [![Jazzy Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/jazzy-build.yml/badge.svg?branch=jazzy)](https://github.com/ros-controls/control_msgs/actions/workflows/jazzy-build.yml) |
16+
| Rolling | [master](https://github.com/ros-controls/control_msgs/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml) |
1717

1818
## Code Formatting
1919

0 commit comments

Comments
 (0)