Merge branch 'master' into reserve_example11

.github/ISSUE_TEMPLATE/good-first-issue.md

@@ -55,6 +55,6 @@ Don’t hesitate to ask questions or to get help if you feel like you are gettin
 Furthermore, you find helpful resources here:
 * [ROS2 Control Contribution Guide](https://control.ros.org/master/doc/contributing/contributing.html)
 * [ROS2 Tutorials](https://docs.ros.org/en/galactic/Tutorials.html)
-* [ROS Answers](https://answers.ros.org/questions/)
+* [Robotics Stack Exchange](https://robotics.stackexchange.com)
 
 **Good luck with your first issue!**

.github/dependabot.yml

@@ -11,3 +11,17 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the
+    # default location of `.github/workflows`
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "iron"
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the
+    # default location of `.github/workflows`
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "humble"

.github/mergify.yml

@@ -0,0 +1,50 @@
+pull_request_rules:
+  - name: Backport to humble at reviewers discretion
+    conditions:
+      - base=master
+      - "label=backport-humble"
+    actions:
+      backport:
+        branches:
+          - humble
+
+  - name: Backport to iron at reviewers discretion
+    conditions:
+      - base=master
+      - "label=backport-iron"
+    actions:
+      backport:
+        branches:
+          - iron
+
+  - name: Ask to resolve conflict
+    conditions:
+      - conflict
+      - author!=mergify[bot]
+      - author!=dependabot[bot]
+    actions:
+        comment:
+          message: This pull request is in conflict. Could you fix it @{{author}}?
+
+  - name: Ask to resolve conflict for backports
+    conditions:
+      - conflict
+      - author=mergify[bot]
+    actions:
+        comment:
+          message: This pull request is in conflict. Could you fix it @bmagyar @dstogl @christophfroehlich?
+
+  - name: development targets master branch
+    conditions:
+      - base!=master
+      - author!=bmagyar
+      - author!=dstogl
+      - author!=christophfroehlich
+      - author!=mergify[bot]
+      - author!=dependabot[bot]
+    actions:
+        comment:
+          message: |
+            @{{author}}, all pull requests must be targeted towards the `master` development branch.
+            Once merged into `master`, it is possible to backport to @{{base}}, but it must be in `master`
+            to have these changes reflected into new distributions.

.github/reviewer-lottery.yml

@@ -14,27 +14,20 @@ groups:
   - name: reviewers
     reviewers: 5
     usernames:
-      - rosterloh
-      - progtologist
+      - aprotyas
       - arne48
+      - bijoua29
       - DasRoteSkelett
-      - sgmurray
-      - harderthan
-      - jaron-l
-      - malapatiravi
+      - duringhof
       - erickisos
-      - sachinkum0009
-      - qiayuanliao
-      - homalozoa
-      - anfemosa
-      - jackcenter
-      - VX792
-      - mhubii
+      - fmauch
+      - jaron-l
       - livanov93
-      - aprotyas
+      - mcbed
+      - moriarty
+      - olivier-stasse
       - peterdavidfagan
-      - duringhof
+      - progtologist
+      - saikishor
       - VanshGehlot
-      - bijoua29
-      - LukasMacha97
-      - mcbed
+      - VX792

.github/workflows/ci-format.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4.7.1
+    - uses: actions/setup-python@v5.0.0
       with:
         python-version: '3.10'
     - name: Install system hooks

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

@@ -5,10 +5,10 @@ name: Iron Binary Build
 on:
   pull_request:
     branches:
-      - master
+      - iron
   push:
     branches:
-      - master
+      - iron
   schedule:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '03 1 * * *'

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

@@ -4,10 +4,10 @@ name: Build Iron Dockerfile
 on:
   pull_request:
     branches:
-      - master
+      - iron
   push:
     branches:
-      - master
+      - iron
   schedule:
     # Run every morning to detect broken dependencies
     - cron: '50 1 * * *'

.github/workflows/iron-semi-binary-build.yml

@@ -4,10 +4,10 @@ name: Iron Semi-Binary Build
 on:
   pull_request:
     branches:
-      - master
+      - iron
   push:
     branches:
-      - master
+      - iron
   schedule:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '33 1 * * *'

.github/workflows/reviewer_lottery.yml

@@ -4,8 +4,9 @@ on:
     types: [opened, ready_for_review, reopened]
 
 jobs:
-  test:
+  reviewer-lottery:
     runs-on: ubuntu-latest
+    if: ${{ ! contains(fromJSON('["dependabot[bot]", "mergify[bot]"]'), github.actor) }}
     steps:
     - uses: actions/checkout@v4
     - uses: uesteibar/reviewer-lottery@v3