diff --git a/.github/workflows/legacy.yml b/.github/workflows/legacy.yml index d5fd7b1be09..08334a71401 100644 --- a/.github/workflows/legacy.yml +++ b/.github/workflows/legacy.yml @@ -31,8 +31,7 @@ jobs: strategy: matrix: coins: [universal, btconly] - # type: [normal, debuglink] - type: [debuglink] + type: [normal, debuglink] env: BITCOIN_ONLY: ${{ matrix.coins == 'universal' && '0' || '1' }} DEBUG_LINK: ${{ matrix.type == 'debuglink' && '1' || '0' }} diff --git a/core/.changelog.d/3324.fixed b/core/.changelog.d/3324.fixed index 6fcea61e1cd..967f102c95f 100644 --- a/core/.changelog.d/3324.fixed +++ b/core/.changelog.d/3324.fixed @@ -1 +1 @@ -[T2B1, T3B1] Fix "PIN attempts exceeded" screen. +[T2B1,T3B1] Fix "PIN attempts exceeded" screen. diff --git a/tools/bump-version.py b/tools/bump-version.py index 2d15701a4d2..9106cdc9d02 100755 --- a/tools/bump-version.py +++ b/tools/bump-version.py @@ -2,6 +2,7 @@ from pathlib import Path import re +import subprocess import click @@ -78,6 +79,8 @@ def cli(project, version): VERSION_MINOR=minor, VERSION_PATCH=patch, ) + # also bump language JSONs + subprocess.run(["python", project / "translations" / "cli.py", "gen"]) elif parts[-1] == "legacy": bump_header( project / "firmware" / "version.h", diff --git a/tools/changelog.py b/tools/changelog.py index 19555793ed1..1ee1883af63 100755 --- a/tools/changelog.py +++ b/tools/changelog.py @@ -140,8 +140,8 @@ def filter_line(line: str) -> str | None: 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 @@ -150,10 +150,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}")