Merge remote-tracking branch 'upstream/master'

.clang-format

@@ -10,5 +10,5 @@ ConstructorInitializerIndentWidth: 0
 ContinuationIndentWidth: 2
 DerivePointerAlignment: false
 PointerAlignment: Middle
-ReflowComments: false
+ReflowComments: true
 IncludeBlocks: Preserve

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

@@ -28,7 +28,7 @@ Nothing. This issue is meant to welcome you to Open Source :) We are happy to wa
 
 - [ ] 🙋 **Claim this issue**: Comment below. If someone else has claimed it, ask if they've opened a pull request already and if they're stuck -- maybe you can help them solve a problem or move it along!
 
-- [ ] 🗄️ **Create a local workspace** for making your changes and testing [following these instructions](https://docs.ros.org/en/foxy/Tutorials/Workspace/Creating-A-Workspace.html), for Step3 use "Download Source Code" section with [these instructions](https://ros-controls.github.io/control.ros.org/getting_started.html#compiling).
+- [ ] 🗄️ **Create a local workspace** for making your changes and testing [following these instructions](https://docs.ros.org/en/rolling/Tutorials/Workspace/Creating-A-Workspace.html), for Step3 use "Download Source Code" section with [these instructions](https://control.ros.org/master/doc/getting_started/getting_started.html#building-from-source).
 
 - [ ] 🍴 **Fork the repository** using the handy button at the top of the repository page and **clone** it into `~/ws_ros2_control/src/ros-controls/ros2_controllers`, [here is a guide that you can follow](https://guides.github.com/activities/forking/) (You will have to remove or empty the existing `ros2_controllers` folder before cloning your own fork)
 
@@ -53,8 +53,8 @@ Nothing. This issue is meant to welcome you to Open Source :) We are happy to wa
 
 Don’t hesitate to ask questions or to get help if you feel like you are getting stuck. For example leave a comment below!
 Furthermore, you find helpful resources here:
-* [ROS2 Control Contribution Guide](https://ros-controls.github.io/control.ros.org/contributing.html)
-* [ROS2 Tutorials](https://docs.ros.org/en/foxy/Tutorials.html)
-* [ROS Answers](https://answers.ros.org/questions/)
+* [ROS2 Control Contribution Guide](https://control.ros.org/master/doc/contributing/contributing.html)
+* [ROS2 Tutorials](https://docs.ros.org/en/rolling/Tutorials.html)
+* [Robotics Stack Exchange](https://robotics.stackexchange.com)
 
 **Good luck with your first issue!**

.github/dependabot.yml

@@ -0,0 +1,27 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+ - package-ecosystem: "github-actions"
+ # Workflow files stored in the
+ # default location of `.github/workflows`
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ - package-ecosystem: "github-actions"
+ # Workflow files stored in the
+ # default location of `.github/workflows`
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ target-branch: "humble"
+ - package-ecosystem: "github-actions"
+ # Workflow files stored in the
+ # default location of `.github/workflows`
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ target-branch: "iron"

.github/mergify.yml

@@ -1,26 +1,50 @@
 pull_request_rules:
- - name: Backport to galactic at reviewers discretion
+ - name: Backport to humble at reviewers discretion
  conditions:
  - base=master
- - "label=backport-galactic"
+ - "label=backport-humble"
  actions:
  backport:
  branches:
- - galactic
+ - humble
 
- - name: Backport to foxy at reviewers discretion
+ - name: Backport to iron at reviewers discretion
  conditions:
  - base=master
- - "label=backport-foxy"
+ - "label=backport-iron"
  actions:
  backport:
  branches:
- - foxy
+ - iron
 
  - name: Ask to resolve conflict
  conditions:
  - conflict
- - author!=mergify
+ - 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 @destogl @christophfroehlich?
+
+ - name: development targets master branch
+ conditions:
+ - base!=master
+ - author!=bmagyar
+ - author!=destogl
+ - 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/PULL_REQUEST_TEMPLATE/pull_request_template.md → .github/pull_request_template.md

@@ -1,13 +1,3 @@
-
----
-name: Pull request
-about: Create a pull request
-title: ''
-labels: ''
-assignees: ''
-
----
-
 Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
 
 1. Limited scope. Your PR should do one thing or one set of things. Avoid adding “random fixes” to PRs. Put those on separate PRs.