Skip to content

fix: reduce false positives in rules 003, 004, and 400 #188

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

Merged
SecondSkoll merged 1 commit into from
Apr 7, 2026
Merged

fix: reduce false positives in rules 003, 004, and 400 #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions styles/Canonical/003-Ubuntu-names-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ scope:
level: error
tokens:
# LTS releases should be followed by "LTS" suffix.
- 'Ubuntu \d?[02468]\.04(?! LTS)'
- 'Ubuntu 6\.06(?! LTS)'
# Use (?!\.\d| LTS) so point releases like "Ubuntu 24.04.4 LTS" are not flagged.
- 'Ubuntu \d?[02468]\.04(?!\.\d| LTS)'
- 'Ubuntu 6\.06(?!\.\d| LTS)'
# Non-LTS releases should not be followed by "LTS" suffix.
- 'Ubuntu \d?\d\.10 LTS'
- 'Ubuntu \d?[13579]\.04 LTS'
Expand Down
3 changes: 2 additions & 1 deletion styles/Canonical/004-Canonical-product-names.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ swap:
Snapcraft: Snapcraft
snapd: snapd # Vale seems to allow normal capitalisation, may need specific existence rule for Snapd
Ubuntu Core: Ubuntu Core
(?<=Ubuntu )Pro: Pro
# \b ensures only "Ubuntu Pro" matches, not "Ubuntu project", "Ubuntu provides", etc.
(?<=Ubuntu )Pro\b: Pro
Ubuntu Server: Ubuntu Server

# Not working with multi-word terms that have the first word in the accept list
Expand Down
2 changes: 1 addition & 1 deletion styles/Canonical/400-Enforce-inclusive-terms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tokens:
- black( )?hats?
- white( )?hats?
- illegal characters?
- masters?
- (?<!\/)masters?
- (?<!jenkins\-)slaves?
- chairman
- foreman
Expand Down
14 changes: 14 additions & 0 deletions tests/data/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ rules:
Ubuntu 24.04 LTS
Ubuntu 24.04 LTS (Noble)
Ubuntu 24.04 LTS (Noble Numbat)
Ubuntu 24.04.4 LTS
Ubuntu 24.04.4 LTS (Noble Numbat)

## Ubuntu 24.04 LTS

Expand Down Expand Up @@ -122,6 +124,18 @@ rules:
- SnapD
- pro
severity: error
- id: ubuntu-pro-not-flagged
filetypes: [md, rst]
content: |
The Ubuntu project is open source.
Ubuntu provides a range of tools.
Ubuntu proposed-migration is a process.
See the Ubuntu Pro page for subscription info.
Ubuntu pro is a product.
expect:
triggers:
- pro
severity: error
005-Industry-product-names:
cases:
- id: valid
Expand Down