diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2023-05-01 19:23:42 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-05-02 05:03:11 +0000 |
| commit | 6db4ddbb1ca8ca3341d2e985aed7368f011af070 (patch) | |
| tree | cf29a4bff8b9166550d825383ffe05880cc6e164 | |
| parent | 96f9a0282c135dfcdb9de112c8d14772d74f23c3 (diff) | |
| download | chrome-ec-6db4ddbb1ca8ca3341d2e985aed7368f011af070.tar.gz | |
pre-upload: Make BRANCH= optional, disable Signed-off-by
Signed-off-by is useless. Gerrit enforces that contributors have
signed a CLA in order to upload, and therefore, it's not necessary for
contributors to acknowledge they've signed a CLA in their commit
message. This would be consistent with the rest of ChromeOS.
Additionally, BRANCH= is not used by the rest of the OS, and as we
move our EC towards a branching model that does not depend on manual
cherry picks, it's becoming less and less useful. Most commits these
days have stuff like BRANCH=none, or BRANCH=i don't care stop
bothering me. We could make BRANCH= optional only for commits which
wish to specify it, but not a requirement to upload.
BUG=b:280345831
TEST=pre-upload passes
Change-Id: I1f2f728b9d6890ce2b21dbf3316afe4354ba3054
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4497661
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jack Rosenthal <jrosenth@chromium.org>
Tested-by: Jack Rosenthal <jrosenth@chromium.org>
| -rw-r--r-- | PRESUBMIT.cfg | 4 | ||||
| -rw-r--r-- | README.md | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/PRESUBMIT.cfg b/PRESUBMIT.cfg index 03a926a92e..79b94053fa 100644 --- a/PRESUBMIT.cfg +++ b/PRESUBMIT.cfg @@ -4,7 +4,6 @@ clang_format_check: true branch_check: true checkpatch_check: true kerneldoc_check: true -signoff_check: true # We are using Linux style indentation with tabs # The indentation is checked by checkpatch not the python script @@ -12,7 +11,8 @@ tab_check: false [Hook Overrides Options] black_check: --include_regex=^util/chargen$ -checkpatch_check: --no-tree --ignore=MSLEEP,VOLATILE,SPDX_LICENSE_TAG +branch_check: --optional +checkpatch_check: --no-tree --no-signoff --ignore=MSLEEP,VOLATILE,SPDX_LICENSE_TAG kerneldoc_check: --include_regex=\bec_commands\.h$ keyword_check: --block=zassume_ @@ -509,7 +509,7 @@ Prior to uploading a new change for review, please run the EC unit tests with: These commands will build and run unit tests in an emulator on your host. -Pre-submit checks are run when you try to upload a change-list. If you wish to +Pre-upload checks are run when you try to upload a change-list. If you wish to run these checks manually first, commit your change locally then run the following command from within the chroot and while in the `src/platform/ec` directory: @@ -518,14 +518,13 @@ directory: (chroot) $ ~/trunk/src/repohooks/pre-upload.py ``` -The pre-submit checks include checking the commit message. Commit messages must -have a `BUG`, `BRANCH`, and `TEST` line along with `Signed-off-by: First Last -<name@company.com>`. The signed-off-by line is a statement that you have written -this code and it can be contributed under the terms of the `LICENSE` file. +The pre-upload checks include checking the commit message. Commit messages must +have a `BUG` and `TEST`. You may also optionally include a `BRANCH` line with a +list of board names for which the CL should be cherry-picked back to old +branches for. Please refer to existing commits (`git log`) to see the proper format for the -commit message. If you have configured git properly, running `git commit` with -the `-s` argument will add the Signed-off-by line for you. +commit message. Note that code you submit must adhere to the [ChromeOS EC Firmware Test Requirements]. |