From d375db9fc29143e812d72e57b1f32e18ebad7aa4 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Wed, 29 Jan 2025 18:05:06 +0100 Subject: [PATCH] fix(tools): changelog.py: stricter model list format --- core/embed/projects/prodtest/.changelog.d/4564.fixed | 2 +- tools/changelog.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/embed/projects/prodtest/.changelog.d/4564.fixed b/core/embed/projects/prodtest/.changelog.d/4564.fixed index a9fec35d07..7bab5a68a4 100644 --- a/core/embed/projects/prodtest/.changelog.d/4564.fixed +++ b/core/embed/projects/prodtest/.changelog.d/4564.fixed @@ -1 +1 @@ -[T2B1, T3B1] Fix displaying QR code and text. +[T2B1,T3B1] Fix displaying QR code and text. diff --git a/tools/changelog.py b/tools/changelog.py index 1921ac0529..bc8e44c324 100755 --- a/tools/changelog.py +++ b/tools/changelog.py @@ -142,8 +142,8 @@ def filter_changelog(changelog_file: Path, internal_name: str): def _iter_fragments(project: Path) -> Iterator[Path]: - fragements_dir = project / ".changelog.d" - for fragment in fragements_dir.iterdir(): + fragments_dir = project / ".changelog.d" + for fragment in fragments_dir.iterdir(): if fragment.name in IGNORED_FILES: continue yield fragment @@ -152,10 +152,13 @@ def _iter_fragments(project: Path) -> Iterator[Path]: def check_fragments_style(project: Path): success = True for fragment in _iter_fragments(project): - fragment_text = fragment.read_text().rstrip() + fragment_text = fragment.read_text().strip() if not fragment_text.endswith("."): click.echo(f"Changelog '{fragment}' must end with a period.") success = False + if fragment_text.startswith("[") and not MODELS_RE.search(fragment_text): + click.echo(f"Wrong model specifier in '{fragment}'") + success = False if not success: raise click.ClickException(f"Changelog style error: {project}")