JOJ/JOJ3
25
6
Fork 1
Code Issues 6 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: groups recording for [all]
Some checks failed
submodules sync / sync (push) Successful in 4m20s
Details
build / build (push) Failing after 12m42s
Details
build / trigger-build-image (push) Has been skipped
Details

Browse Source
This commit is contained in:
张泊明518370910136 2026-03-18 10:50:01 -07:00
parent e20ebfaa81
commit bd15d5ce05
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/joj3/conf/conf.go
View File

@ -202,20 +202,7 @@ func MatchGroups(conf *Conf, conventionalCommit *ConventionalCommit) []string {
seen := make(map[string]bool)
keywords := []string{}
loweredCommitGroup := strings.ToLower(conventionalCommit.Group)
if loweredCommitGroup == "all" {
for i := range conf.PreStages {
conf.PreStages[i].Group = ""
conf.PreStages[i].Groups = nil
}
for i := range conf.Stages {
conf.Stages[i].Group = ""
conf.Stages[i].Groups = nil
}
for i := range conf.PostStages {
conf.PostStages[i].Group = ""
conf.PostStages[i].Groups = nil
}
}
matchAllGroups := loweredCommitGroup == "all"
confStages := []ConfStage{}
confStages = append(confStages, conf.PreStages...)
confStages = append(confStages, conf.Stages...)
@ -241,10 +228,24 @@ func MatchGroups(conf *Conf, conventionalCommit *ConventionalCommit) []string {
slog.Info("group keywords from stages", "keywords", keywords)
groups := []string{}
for _, keyword := range keywords {
if strings.Contains(loweredCommitGroup, keyword) {
if matchAllGroups || strings.Contains(loweredCommitGroup, keyword) {
groups = append(groups, keyword)
}
}
slog.Info("matched groups", "groups", groups)
if matchAllGroups {
for i := range conf.PreStages {
conf.PreStages[i].Group = ""
conf.PreStages[i].Groups = nil
}
for i := range conf.Stages {
conf.Stages[i].Group = ""
conf.Stages[i].Groups = nil
}
for i := range conf.PostStages {
conf.PostStages[i].Group = ""
conf.PostStages[i].Groups = nil
}
}
return groups
}