You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: source/The-ROS2-Project/Contributing/Developer-Guide.rst
+12-5Lines changed: 12 additions & 5 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -159,13 +159,11 @@ Guidelines for backporting PRs
159
159
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
160
160
161
161
When changing an older version of ROS:
162
-
163
162
* Make sure the features or fixes are accepted and merged in the rolling branch before opening a PR to backport the changes to older versions.
164
163
* When backporting to older versions, also consider backporting to any other :doc:`still supported versions <../../Releases>`, even non-LTS versions.
165
164
* If you are backporting a single PR in its entirety, title the backport PR "[Distro] <name of original PR>".
166
-
If backporting a subset of changes from one or multiple PRs, the title should be "[Distro] <description of changes>".
167
165
* Link to all PRs whose changes you're backporting from the description of your backport PR.
168
-
In a Dashing backport of a Foxy change, you do not need to link to the Eloquent backport of the same change.
166
+
* Package maintainers typically use `Mergifyio <https://mergify.com/>`_ to automatically backport PRs to downstream distributions when needed, however developers can still perform manual backporting operations as described above when necessary.
169
167
170
168
Documentation
171
169
^^^^^^^^^^^^^
@@ -360,7 +358,8 @@ Pull requests
360
358
As the opener of a pull-request, if you are working in a fork, checking the box to `allow edits from upstream contributors <https://github.com/blog/2247-improving-collaboration-with-forks>`__ will assist with the aforementioned.
361
359
As a reviewer, also feel free to make more substantial improvements, but consider putting them in a separate branch (either mention the new branch in a comment, or open another pull request from the new branch to the original branch).
362
360
363
-
* Any developer (the author, the reviewer, or somebody else) can merge any approved pull request.
361
+
* Only maintainers and committers can merge approved pull requests into the mainline.
362
+
See the :doc:`current ROS PMC constituents and committers <../Governance>` for the list of people with merge permissions.
364
363
365
364
Library versioning
366
365
^^^^^^^^^^^^^^^^^^
@@ -759,6 +758,7 @@ The build farm is located at `ci.ros2.org <https://ci.ros2.org/>`__.
759
758
Every night we run nightly jobs which build and run all the tests in various scenarios on various platforms.
760
759
Additionally, we test all pull requests against these platforms before merging.
761
760
761
+
<<<<<<< HEAD
762
762
This is the current set of target platforms and architectures, though it evolves overtime:
763
763
764
764
@@ -770,15 +770,18 @@ This is the current set of target platforms and architectures, though it evolves
770
770
* Windows 10
771
771
772
772
* amd64
773
+
=======
774
+
Check :ref:`the current set of target platforms and architectures <binary-package-platforms>`, though it evolves overtime.
775
+
>>>>>>> c3ef599 (Cosmetic fixes for Developer Guide. (#5872))
773
776
774
777
There are several categories of jobs on the buildfarm:
775
778
776
-
777
779
* manual jobs (triggered manually by developers):
778
780
779
781
* ci_linux: build + test the code on Ubuntu
780
782
* ci_linux-aarch64: build + test the code on Ubuntu on an ARM 64-bit machine (aarch64)
781
783
* ci_linux_coverage: build + test + generation of test coverage
784
+
* ci_linux-rhel: build + test the code on Red Hat Enterprise Linux
782
785
* ci_windows: build + test the code on Windows
783
786
* ci_launcher: trigger all the jobs listed above
784
787
@@ -788,18 +791,21 @@ There are several categories of jobs on the buildfarm:
788
791
789
792
* nightly_linux_debug
790
793
* nightly_linux-aarch64_debug
794
+
* nightly_linux-rhel_debug
791
795
* nightly_win_deb
792
796
793
797
* Release: build + test the code with CMAKE_BUILD_TYPE=Release
794
798
795
799
* nightly_linux_release
796
800
* nightly_linux-aarch64_release
801
+
* nightly_linux-rhel_release
797
802
* nightly_win_rel
798
803
799
804
* Repeated: build then run each test up to 20 times or until failed (aka flakiness hunter)
800
805
801
806
* nightly_linux_repeated
802
807
* nightly_linux-aarch64_repeated
808
+
* nightly_linux-rhel_repeated
803
809
* nightly_win_rep
804
810
805
811
* Coverage:
@@ -812,6 +818,7 @@ There are several categories of jobs on the buildfarm:
812
818
* packaging (run every night; result is bundled into an archive):
813
819
814
820
* packaging_linux
821
+
* packaging_linux-rhel
815
822
* packaging_windows
816
823
817
824
Two additional build farms support the ROS / ROS 2 ecosystem by providing building of source and
0 commit comments