Skip to content

Commit 02a611c

Browse files
committed
Merge branch 'main' into dev/arle/design-system
2 parents fc7df80 + d5bd350 commit 02a611c

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

build/templates/validate-commits.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ steps:
2424
Write-Host "Commits found: $commitCount"
2525
2626
# Regex pattern for Conventional Commits
27-
$pattern = '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test){1}(\([\w\.\-]+\))?(!)?: ([\w ])+([\s\S]*)|^(Merged PR \d+: .+)|^(Merge pull request #/d+ from .+)'
27+
$pattern = '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test){1}(\([\w\.\-]+\))?(!)?: ([\w ])+([\s\S]*)|^(Merged PR \d+: .+)|^(Merge pull request #\d+ from .+)|^(Merge branch .+)'
2828
Write-Host "Regular Expression: $pattern"
2929
3030
# Validate each commit message

doc/Localization.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ String myString = local.myString;
1818
- The generated files are generated at [lib/l10n/gen_l10n](../src/app/lib/l10n/gen_l10n/) instead of the default location due to problems with the pipeline and artificial packages.
1919

2020
> 💡 Please note that to be able to access the strings, you need to run `flutter pub get` to generate them.
21+
22+
- After running the app for the first time, localization files should be created automatically, if not it might be necessary to run the command `flutter gen-l10n` to generate the localization files.

src/cli/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
55

66
Prefix your items with `(Template)` if the change is about the template and not the resulting application.
77

8-
## 0.24.4
8+
## 0.25.0
99
- Added design system, including color scheme and fonts.
1010

11+
## 0.24.4
12+
- Fix commit validation after a merge.
13+
- Update localization documentation.
14+
1115
## 0.24.3
1216
- Update CLI documentation.
1317

0 commit comments

Comments
 (0)