Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Cherry pick PR #1498: Add check-xml pre-commit #1502

Closed
wants to merge 2 commits into from
Closed

Cherry pick PR #1498: Add check-xml pre-commit #1502

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbbc716
Add check-xml pre-commit (#1498)
joeltine Sep 6, 2023
334e757
Add check-xml pre-commit (#1498)
joeltine Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,19 @@ exclude: |
testing|
third_party|
tools/gyp|
tools/python|
url
)/
|
components/update_client/((?!cobalt).)*$
|
# Ignore everything under tools/metrics _except_ xml files. We need
# those validated to keep the telemetry/metrics pipeline working.
tools/metrics/(.*\.(?!xml$)[^/]*|[^/.]+)$|
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is the only regex you want to add, the rest seem to be unrelated to your original change

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's more than I added originally, but I had to merge conflicts because previous changes to this file were not CP'd into 24.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But are the other changes relevant to your change? I would expect this is all you need to add to the regex (though I'd consider changing it directly to the fixed version from #1509). The changes below, for example, only seem to be needed for #1110 which will not be cherry picked to this branch

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. Another option is not to CP this at all. Is a presubmit like this necessary in the 24 branch?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, if you don't expect significant changes to xml files on this branch, it makes sense to forgo this change—especially as they'll likely first go through trunk where we have this check in place already

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

K let's skip it.

.*\.pb\.cc$ |
.*\.pb\.h$ |
.*\.patch$ |
.*Proto.java$|
.*\.sig$
)

Expand All @@ -40,6 +48,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- id: mixed-line-ending
- id: check-xml

- repo: https://cobalt.googlesource.com/codespell
rev: 67c489d36dd4c52cbb9e4755d90c35c6231842ef # v2.0.0
Expand Down
Loading