Skip to content

Commit

Permalink
Remove ci_lint.sh
Browse files Browse the repository at this point in the history
After the previous commit, it doesn't do much, only passes the linting
exceptions file on the command line. Instead, make the lint.exceptions
file the default for that argument (if it exists), and remove the shell
script.
  • Loading branch information
ptomato committed Nov 12, 2024
1 parent 7fc86bc commit 0df1565
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/checks-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
run: ./tools/lint/test/run.py

- name: Lint all tests
run: ./tools/scripts/ci_lint.sh
run: ./tools/lint/lint.py test/
2 changes: 1 addition & 1 deletion .github/workflows/checks-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ jobs:
for file in $CHANGED; do
echo $file
done
./tools/scripts/ci_lint.sh $CHANGED
./tools/lint/lint.py $CHANGED
6 changes: 5 additions & 1 deletion tools/lint/lint.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,11 @@ def lint(file_names, features):
if args.exceptions:
exceptions = lib.exceptions.parse(args.exceptions)
else:
exceptions = dict()
try:
with open('lint.exceptions', 'r') as default_exceptions:
exceptions = lib.exceptions.parse(default_exceptions)
except FileNotFoundError:
exceptions = dict()

files = [path for _path in args.path for path in collect_files(_path)]
file_count = len(files)
Expand Down
7 changes: 0 additions & 7 deletions tools/scripts/ci_lint.sh

This file was deleted.

0 comments on commit 0df1565

Please sign in to comment.