-
Notifications
You must be signed in to change notification settings - Fork 6.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
doc: changes to merge criteria (4 eyes principle) #62122
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -271,7 +271,7 @@ Generic guidelines for deciding and filling in the Maintainers' list | |
|
||
* Pull requests may be re-assigned if this is needed or more appropriate | ||
|
||
* Re-assigned by original assignee (see “Assignee” slide) | ||
* Re-assigned by original assignee | ||
|
||
* In general, updates to the MAINTAINERS file should be | ||
in a standalone commit alongside other changes introducing new files and | ||
|
@@ -314,15 +314,48 @@ Release Activity | |
Merge Criteria | ||
++++++++++++++ | ||
|
||
* All continuous integration checks have passed | ||
* Minimal of 2 approvals, including an approval by the designated assignee. | ||
* Pull requests should be reviewed by at least a maintainer or collaborator of | ||
each affected area; Unless the changes to a given area are considered trivial | ||
enough, in which case approvals by other affected subsystems | ||
maintainers/collaborators would suffice. | ||
* Four eye principle on the organisation level. We already require at least 2 | ||
approvals (basic four eye principle), however, such reviews and approvals | ||
might be unintentionally biased in the case where the submitter is from the | ||
same organisation as the approvers. To allow for project wide review and | ||
approvals, the merge criteria is extended with the guidelines below: | ||
|
||
* Changes or additions to common and shared code shall have approvals from | ||
different organisations (at least one approval from an | ||
organisation different than the submitters'). | ||
Common and shared code is defined as anything that does not fall under | ||
:file:`soc`, :file:`boards` and :file:`drivers/*/*`. | ||
* Changes or additions to hardware support (driver, SoC, boards) shall at | ||
nashif marked this conversation as resolved.
Show resolved
Hide resolved
nashif marked this conversation as resolved.
Show resolved
Hide resolved
|
||
least have the merger be from a different organisation. This applies only | ||
to implementation of an API supporting vendor specific hardware and not the | ||
APIs. | ||
* Release engineers may make exceptions for areas with contributions primarily | ||
coming from one organisation and where reviews from other organisations are | ||
not possible, however, merges shall be completed by a person from a different | ||
organisation. In such cases, the minimum review period of at least 2 days | ||
shall be strictly followed to allow for additional reviews. | ||
* Release engineers shall not merge code changes originating and reviewed | ||
only by their own organisation. To be able to merge such changes, at least | ||
aescolar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
one review shall be from a different organisation. | ||
|
||
* A minimum review period of 2 business days, 4 hours for trivial changes (see | ||
:ref:`review_time`). | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I find these very short but off-topic... |
||
* Hotfixes can be merged at any time after CI has passed and are excluded from | ||
most of the conditions listed above. | ||
* All required checks are passing: | ||
|
||
* Codeowners | ||
* Device Tree | ||
* Documentation | ||
* Gitlint | ||
* Identity/Emails | ||
* Kconfig | ||
* License | ||
* License checks | ||
nashif marked this conversation as resolved.
Show resolved
Hide resolved
|
||
* Checkpatch (Coding Style) | ||
* Pylint | ||
* Integration Tests (Via twister) on emulation/simulation platforms | ||
|
@@ -335,15 +368,3 @@ Merge Criteria | |
* Coding Guidelines | ||
* Static Analysis (Coverity) | ||
* Documentation coverage (APIs) | ||
|
||
* PR template with checklist | ||
|
||
* Minimal of 2 approvals | ||
|
||
* A collaborator from the same subsystem. | ||
* Alternately another maintainer of another subsystem | ||
* Approval by the assignee | ||
|
||
* A minimum review period of 2 days, 4 hours for trivial changes (see | ||
:ref:`review_time`). Hotfixes can be merged at any time after CI passes. | ||
* All required checks are passing |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.