mirror of
https://github.com/vcmi/vcmi.git
synced 2025-07-17 01:32:21 +02:00
CI: Only use json5 Python package for validation
This simplifies the script and makes the output more readable
This commit is contained in:
2
.github/workflows/github.yml
vendored
2
.github/workflows/github.yml
vendored
@ -124,7 +124,7 @@ jobs:
|
|||||||
# also, running it on multiple presets is redundant and slightly increases already long CI built times
|
# also, running it on multiple presets is redundant and slightly increases already long CI built times
|
||||||
if: ${{ startsWith(matrix.preset, 'linux-clang-test') }}
|
if: ${{ startsWith(matrix.preset, 'linux-clang-test') }}
|
||||||
run: |
|
run: |
|
||||||
pip3 install json5 jstyleson
|
pip3 install json5
|
||||||
python3 CI/linux-qt6/validate_json.py
|
python3 CI/linux-qt6/validate_json.py
|
||||||
|
|
||||||
- name: Dependencies
|
- name: Dependencies
|
||||||
|
@ -6,55 +6,22 @@ from pathlib import Path
|
|||||||
from pprint import pprint
|
from pprint import pprint
|
||||||
|
|
||||||
import json5
|
import json5
|
||||||
import jstyleson
|
|
||||||
import yaml
|
|
||||||
|
|
||||||
# 'json', 'json5' or 'yaml'
|
validation_failed = False
|
||||||
# json: strict, but doesn't preserve line numbers necessarily, since it strips comments before parsing
|
|
||||||
# json5: strict and preserves line numbers even for files with line comments
|
|
||||||
# yaml: less strict, allows e.g. leading zeros
|
|
||||||
VALIDATION_TYPE = "json5"
|
|
||||||
|
|
||||||
errors = []
|
for path in sorted(Path(".").glob("**/*.json"), key=lambda path: str(path).lower()):
|
||||||
for path in sorted(Path(".").glob("**/*.json")):
|
|
||||||
# because path is an object and not a string
|
# because path is an object and not a string
|
||||||
path_str = str(path)
|
path_str = str(path)
|
||||||
|
if path_str.startswith("."):
|
||||||
|
continue
|
||||||
|
|
||||||
try:
|
try:
|
||||||
with open(path_str, "r") as file:
|
with open(path_str, "r") as file:
|
||||||
if VALIDATION_TYPE == "json":
|
json5.load(file)
|
||||||
jstyleson.load(file)
|
print(f"✅ {path_str}")
|
||||||
elif VALIDATION_TYPE == "json5":
|
|
||||||
json5.load(file)
|
|
||||||
elif VALIDATION_TYPE == "yaml":
|
|
||||||
file = file.read().replace("\t", " ")
|
|
||||||
file = file.replace("//", "#")
|
|
||||||
yaml.safe_load(file)
|
|
||||||
print(f"Validation of {path_str} succeeded")
|
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
print(f"Validation of {path_str} failed")
|
print(f"❌ {str(exc).replace('<string>', path_str)}")
|
||||||
pprint(exc)
|
validation_failed = True
|
||||||
|
|
||||||
error_pos = path_str
|
if validation_failed:
|
||||||
|
|
||||||
# create error position strings for each type of parser
|
|
||||||
if hasattr(exc, "pos"):
|
|
||||||
# 'json'
|
|
||||||
# https://stackoverflow.com/a/72850269/2278742
|
|
||||||
error_pos = f"{path_str}:{exc.lineno}:{exc.colno}"
|
|
||||||
print(error_pos)
|
|
||||||
elif VALIDATION_TYPE == "json5":
|
|
||||||
# 'json5'
|
|
||||||
pos = re.findall(r"\d+", str(exc))
|
|
||||||
error_pos = f"{path_str}:{pos[0]}:{pos[-1]}"
|
|
||||||
elif hasattr(exc, "problem_mark"):
|
|
||||||
# 'yaml'
|
|
||||||
mark = exc.problem_mark
|
|
||||||
error_pos = f"{path_str}:{mark.line+1}:{mark.column+1}"
|
|
||||||
print(error_pos)
|
|
||||||
|
|
||||||
errors.append({"error_pos": error_pos, "error_msg": exc})
|
|
||||||
|
|
||||||
if errors:
|
|
||||||
print("The following JSON files are invalid:")
|
|
||||||
pprint(errors)
|
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
Reference in New Issue
Block a user