commit | b9de46b97edaa5bdcb96f4b8e629b7ceb6ce3049 | [log] [tgz] |
---|---|---|
author | Daisuke Nojiri <dnojiri@chromium.org> | Fri Sep 11 18:20:05 2020 -0700 |
committer | Commit Bot <commit-bot@chromium.org> | Sun Sep 13 19:58:44 2020 +0000 |
tree | 05c6c0618c310bbfb33313662ca0ae4fc4372da4 | |
parent | 71c9c781e2403a33054be5b19c51fcd57eb6b92f [diff] |
pre-submit: Unlink unblocked_terms.txt As we make the codebase more inclusive, words will be removed from the global unblocked_terms.txt. This patch unlinks unblocked_terms.txt from blocked_terms.txt so that the former can be updated separately. BUG=b:165908442 TEST=None Change-Id: I04693c65e723f2196bfca0c706d46b5cbd8cadfe Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/repohooks/+/2407016 Reviewed-by: Mike Frysinger <vapier@chromium.org> Commit-Queue: Bernie Thompson <bhthompson@chromium.org> Tested-by: Bernie Thompson <bhthompson@chromium.org>
This repo holds hooks that get run by repo during the upload phase. They perform various checks automatically such as running linters on your code.
Note: Currently all hooks are enabled by default. Each repo must explicitly turn off any hook it wishes to disable.
Note: While we still use “presubmit” in many places (including config files), these checks only run at preupload time.
Normally these execute automatically when you run repo upload
. If you want to run them by hand, you can execute pre-upload.py
directly. By default, that will scan the active repo and process all commits that haven't yet been merged. See its help for more info.
Sometimes you might want to bypass the upload checks. While this is strongly discouraged (often failures you add will affect others and block them too), sometimes there are valid reasons for this. You can simply use the option --no-verify
when running repo upload
to skip all upload checks. This will skip all checks and not just specific ones. It should be used only after having run & evaluated the upload output previously.
This file is checked in the top of a specific git repository. Stacking them in subdirectories (to try and override parent settings) is not supported.
# Per-project `repo upload` hook settings. # https://chromium.googlesource.com/chromiumos/repohooks/ [Hook Scripts] cros lint = cros lint ${PRESUBMIT_FILES} pre-upload_unittest = ./pre-upload_unittest.py [Hook Overrides] cros_license_check: true long_line_check: true tab_check: true stray_whitespace_check: true [Hook Overrides Options] cros_license_check: --exclude_regex=\b(checkpatch\.pl|kernel-doc)$
Hooks are executed in the top directory of the git repository. All paths should generally be relative to that point.
A few environment variables are set so scripts don't need to discover things.
PRESUBMIT_PROJECT
: The project name being changed by the commit (e.g. ‘chromiumos/platform/firmware’).PRESUBMIT_COMMIT
: The full commit hash of your change.PRESUBMIT_FILES
: A list of files affected by your commit delimited by newlines.This section allows for completely arbitrary hooks to run on a per-repo basis.
The key can be any name (as long as the syntax is valid), as can the program that is executed. The key is used as the name of the hook for reporting purposes, so it should be at least somewhat descriptive.
Whitespace in the key name is OK!
The keys must be unique as duplicates will silently clobber earlier values.
You do not need to send stderr to stdout. The tooling will take care of merging them together for you automatically.
[Hook Scripts] my first hook = program --gogog ${PRESUBMIT_FILES} another hook = funtimes --i-need "some space" ${PRESUBMIT_FILES} some fish = linter --ate-a-cat ${PRESUBMIT_FILES} some cat = formatter --cat-commit ${PRESUBMIT_COMMIT}
This section allows for turning off common/builtin hooks.
Note: Not all hooks that we run may be disabled. We only document the ones that may be controlled by the config file here, but we run many more checks.
aosp_license_check
: Require source files have an Android (Apache) license.branch_check
: Require all commit messages have a BRANCH=
line.bug_field_check
: Require all commit messages have a BUG=
line.checkpatch_check
: Run commits through Linux's checkpatch.pl
tool.clang_format_check
: Run source code through clang-format
.contribution_check
: Check source files for invalid “not a contribution”.cros_license_check
: Require source files have a Chromium (BSD) license.filepath_chartype_check
: Check source files for FilePath::CharType use.json_check
: Check all .json
files are valid JSON.kerneldoc_check
: Run commits through Linux's kernel-doc
tool.long_line_check
: Do not allow lines longer than 80 cols.manifest_check
: Check all ebuild Manifest
files.project_prefix_check
: Require all commit message have a subdir prefix.signoff_check
: Require all commit messages have a Signed-off-by
tag.stray_whitespace_check
: Check source files for stray whitespace.tabbed_indent_required_check
: Require tabs for indentation.tab_check
: Do not allow tabs for indentation in source files.test_field_check
: Require all commit messages have a TEST=
line.Some hooks accept custom options. The key name matches the Hook Overrides name above, so see that list for more details.
[Hook Overrides Options] cros_license_check: --exclude_regex=\b(checkpatch\.pl|kernel-doc)$
blocked_terms.txt
contains a default list of words which are blocked by keyword_check. unblocked_terms.txt
is a default list of words which are unblocked. They have the same contents. So, by default nothing is blocked.
The global unblocked_terms.txt
is referenced only if a copy doesn‘t exist in a project. Thus, by copying unblocked_terms.txt
to your project, you can start blocking changes which contain words not listed in the project’s unblocked_terms.txt
:
unblocked_terms.txt
to the project's root directory.$ ~/chromiumos/src/platform/dev/contrib/search_blocked_words.sh
unblocked_terms.txt
When later making the project more inclusive, you can do:
unblocked_terms.txt
.$ ~/chromiumos/src/platform/dev/contrib/search_blocked_words.sh
unblocked_terms.txt
.We have many third party repos where you probably want to disable CrOS checks. You‘ll need to disable each one in your project’s PRESUBMIT.cfg file. See the reference above for which checks you probably want to disable.
You can file bugs at https://crbug.com/new with Component=Infra>ChromeOS>Build>Platform.
If you want to ask questions, use our normal development groups.