Skip to content

Commit 2440af8

Browse files
christophfroehlichchristophfroehlich
authored
Branch for rolling (#16)
1 parent 6d39e3e commit 2440af8

11 files changed

Lines changed: 169 additions & 12 deletions

‎.github/dependabot.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,10 @@ 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: "humble"

‎.github/mergify.yml‎

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

‎.github/workflows/humble-binary-build.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
2+
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)
3+
4+
name: Humble - Binary Build
5+
on:
6+
workflow_dispatch:
7+
pull_request: &event
8+
branches:
9+
- humble
10+
push: *event
11+
12+
concurrency:
13+
# cancel previous runs of the same workflow, except for pushes on given branches
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
16+
17+
jobs:
18+
binary:
19+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
ROS_DISTRO: [humble, jazzy, kilted]
24+
ROS_REPO: [main, testing]
25+
with:
26+
ros_distro: ${{ matrix.ROS_DISTRO }}
27+
ros_repo: ${{ matrix.ROS_REPO }}
28+
ref_for_scheduled_build: master
29+
binary_clang:
30+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
31+
with:
32+
ros_distro: humble
33+
ros_repo: testing
34+
ref_for_scheduled_build: master
35+
additional_debs: clang
36+
c_compiler: clang
37+
cxx_compiler: clang++
38+
not_test_build: true

‎.github/workflows/humble-debian-binary-build.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Humble - Debian Binary Build
2+
on:
3+
workflow_dispatch:
4+
pull_request: &event
5+
branches:
6+
- humble
7+
push: *event
8+
9+
concurrency:
10+
# cancel previous runs of the same workflow, except for pushes on given branches
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
13+
14+
jobs:
15+
debian_binary_build:
16+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
ROS_DISTRO: [humble, jazzy, kilted]
21+
with:
22+
ros_distro: ${{ matrix.ROS_DISTRO }}
23+
ref_for_scheduled_build: main

‎.github/workflows/humble-format.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Humble Format
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request: &event
6+
branches:
7+
- humble
8+
push: *event
9+
10+
jobs:
11+
pre-commit:
12+
name: pre-commit
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v6
16+
- uses: actions/setup-python@v6
17+
- uses: pre-commit/action@v3.0.1

‎.github/workflows/humble-rhel-binary-build.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Humble - RHEL Binary Build
2+
on:
3+
workflow_dispatch:
4+
pull_request: &event
5+
branches:
6+
- humble
7+
push: *event
8+
9+
concurrency:
10+
# cancel previous runs of the same workflow, except for pushes on given branches
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
13+
14+
jobs:
15+
rhel_binary_build:
16+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
ROS_DISTRO: [humble, jazzy, kilted]
21+
with:
22+
ros_distro: ${{ matrix.ROS_DISTRO }}
23+
ref_for_scheduled_build: main

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
name: Rolling - Binary Build
55
on:
66
workflow_dispatch:
7-
pull_request:
8-
branches:
9-
- main
10-
push:
7+
pull_request: &event
118
branches:
129
- main
10+
push: *event
1311

1412
concurrency:
1513
# cancel previous runs of the same workflow, except for pushes on given branches branch
@@ -22,7 +20,7 @@ jobs:
2220
strategy:
2321
fail-fast: false
2422
matrix:
25-
ROS_DISTRO: [humble, jazzy, kilted, rolling]
23+
ROS_DISTRO: [rolling]
2624
ROS_REPO: [main, testing]
2725
with:
2826
ros_distro: ${{ matrix.ROS_DISTRO }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
ROS_DISTRO: [humble, jazzy, kilted, rolling]
20+
ROS_DISTRO: [rolling]
2121
with:
2222
ros_distro: ${{ matrix.ROS_DISTRO }}
2323
ref_for_scheduled_build: main

.github/workflows/format.yaml renamed to .github/workflows/rolling-format.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: Format
1+
name: Rolling Format
22

33
on:
44
workflow_dispatch:
5-
pull_request:
6-
push:
5+
pull_request: &event
76
branches:
87
- main
8+
push: *event
99

1010
jobs:
1111
pre-commit:

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
name: Rolling - RHEL Binary Build
22
on:
33
workflow_dispatch:
4-
pull_request:
4+
pull_request: &event
55
branches:
66
- main
7+
push: *event
78

89
concurrency:
910
# cancel previous runs of the same workflow, except for pushes on given branches
@@ -16,7 +17,7 @@ jobs:
1617
strategy:
1718
fail-fast: false
1819
matrix:
19-
ROS_DISTRO: [humble, jazzy, kilted, rolling]
20+
ROS_DISTRO: [rolling]
2021
with:
2122
ros_distro: ${{ matrix.ROS_DISTRO }}
2223
ref_for_scheduled_build: main

0 commit comments

Comments
 (0)