From e7c25ca80c887a849c93af2605d2b69854f46338 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Mon, 25 Nov 2024 02:28:27 -0500 Subject: [PATCH] feat(cmd/joj3): pass groups in teapot [force build] --- cmd/joj3/conf/conf.go | 1 + cmd/joj3/main.go | 2 +- cmd/joj3/teapot/run.go | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/joj3/conf/conf.go b/cmd/joj3/conf/conf.go index e325830..24450ca 100644 --- a/cmd/joj3/conf/conf.go +++ b/cmd/joj3/conf/conf.go @@ -340,5 +340,6 @@ func MatchGroups(conf *Conf, conventionalCommit *ConventionalCommit) []string { groups = append(groups, keyword) } } + slog.Info("matched groups", "groups", groups) return groups } diff --git a/cmd/joj3/main.go b/cmd/joj3/main.go index 4aa3944..090a3ed 100644 --- a/cmd/joj3/main.go +++ b/cmd/joj3/main.go @@ -114,7 +114,7 @@ func mainImpl() (err error) { slog.Error("stage write", "error", err) return err } - teapotResult, err = teapot.Run(confObj) + teapotResult, err = teapot.Run(confObj, groups) if err != nil { slog.Error("teapot run", "error", err) return err diff --git a/cmd/joj3/teapot/run.go b/cmd/joj3/teapot/run.go index 3170dd0..dc1dfcc 100644 --- a/cmd/joj3/teapot/run.go +++ b/cmd/joj3/teapot/run.go @@ -23,7 +23,9 @@ type TeapotResult struct { Sha string `json:"sha"` } -func Run(conf *conf.Conf) (teapotResult TeapotResult, err error) { +func Run(conf *conf.Conf, groups []string) ( + teapotResult TeapotResult, err error, +) { os.Setenv("LOG_FILE_PATH", conf.Teapot.LogPath) os.Setenv("_TYPER_STANDARD_TRACEBACK", "1") if env.Attr.Actor == "" || @@ -59,6 +61,7 @@ func Run(conf *conf.Conf) (teapotResult TeapotResult, err error) { env.Attr.RunNumber, conf.Teapot.ScoreboardPath, conf.Teapot.FailedTablePath, conf.Name, env.Attr.Sha, env.Attr.RunID, + strings.Join(groups, ","), "--max-total-score", strconv.Itoa(conf.MaxTotalScore), skipIssueArg, skipScoreboardArg, skipFailedTableArg, submitterInIssueTitleArg,