Skip to content

Commit 39d4203

Browse files
committed
.
1 parent 1e6b626 commit 39d4203

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

.github/workflows/ci-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Run wmllint
3232
if: success() || failure()
3333
run: |
34-
./data/tools/wmllint --config=./data/tools/lint.toml > ./wmllint.log 2>&1
34+
./data/tools/wmllint --config=./data/tools/lint.toml ./data > ./wmllint.log 2>&1
3535
if [ "$(wc -l < wmllint.log)" != "0" ]; then cat wmllint.log; exit 1; fi
3636
- name: Whitespace and WML indentation check
3737
if: success() || failure()

data/tools/lint.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
ignore_files=["./data/lan_server.cfg","./wesnothd.cfg","./utils/ai_test/ai_test.cfg","./data/test/scenarios/cve_tests/test_cve_2018_1999023_2.cfg"]
2-
ignore_directories=["./data/languages","./attic","./data/schema","./data/test/test/filesystem/enum","./po","./changelog_entries"]
1+
ignore_files=["./data/lan_server.cfg","./data/test/scenarios/cve_tests/test_cve_2018_1999023_2.cfg"]
2+
ignore_directories=["./data/languages","./data/schema","./data/test/test/filesystem/enum"]

data/tools/wmllint

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2870,9 +2870,7 @@ scenarios, etc.""")
28702870
# -f --future has been removed; there have been no experimental conversions since 1.4
28712871
# -p --progress has been removed; similar to existing -v -v
28722872
parser.add_argument("directories", action="store", nargs="*",
2873-
help="""Any number of directories. Each directory is converted.
2874-
If no directories are specified, acts on the current
2875-
directory.""")
2873+
help="Any number of directories. Each directory is converted.")
28762874
parser.add_argument("--version", action="version", version="%(prog)s " + version.as_string)
28772875
parser.add_argument("--config", type=str, default="", help="Location of external toml config file to use.")
28782876

@@ -2900,8 +2898,9 @@ directory.""")
29002898
if data.get("ignore_directories"):
29012899
ignore_directories = data["ignore_directories"]
29022900

2903-
if not config or not arguments:
2904-
arguments = ["."]
2901+
if not arguments:
2902+
print("No directory specified to run wmllint on")
2903+
exit(1)
29052904

29062905
if dryrun:
29072906
verbose = max(1, verbose)

0 commit comments

Comments
 (0)