JOJ/JOJ3
24
5
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(cmd/joj3)!: conf #51

Merged
张泊明518370910136 merged 11 commits from conf into master 2024-10-12 13:21:59 +08:00
Conversation 0 Commits 11 Files Changed 6 +52 -41
2 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 214f5e76e8 - Show all commits

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

@ -36,13 +36,14 @@ type Conf struct {
} }
} }
} }
// TODO: allow skip scoreboard/failed table/issue
Teapot struct { Teapot struct {
Skip bool `default:"true"`
LogPath string `default:"/home/tt/.cache/joint-teapot-debug.log"` LogPath string `default:"/home/tt/.cache/joint-teapot-debug.log"`
ScoreboardPath string `default:"scoreboard.csv"` ScoreboardPath string `default:"scoreboard.csv"`
FailedTablePath string `default:"failed-table.md"` FailedTablePath string `default:"failed-table.md"`
GradingRepoName string `default:""` GradingRepoName string `default:""`
SkipIssue bool `default:"false"`
SkipScoreboard bool `default:"false"`
SkipFailedTable bool `default:"false"`
} }
} }

24
cmd/joj3/teapot/main.go
View File

@ -12,12 +12,16 @@ import (
) )
func Run(conf conf.Conf) error { func Run(conf conf.Conf) error {
if conf.Teapot.Skip { actions := os.Getenv("GITHUB_ACTIONS")
if actions != "true" {
slog.Info("teapot exit", "GITHUB_ACTIONS", actions)
return nil return nil
} }
os.Setenv("LOG_FILE_PATH", conf.Teapot.LogPath) os.Setenv("LOG_FILE_PATH", conf.Teapot.LogPath)
os.Setenv("_TYPER_STANDARD_TRACEBACK", "1") os.Setenv("_TYPER_STANDARD_TRACEBACK", "1")
envFilePath := "/home/tt/.config/teapot/teapot.env" envFilePath := "/home/tt/.config/teapot/teapot.env"
// TODO: pass sha to joint-teapot
// sha := os.Getenv("GITHUB_SHA")
actor := os.Getenv("GITHUB_ACTOR") actor := os.Getenv("GITHUB_ACTOR")
repository := os.Getenv("GITHUB_REPOSITORY") repository := os.Getenv("GITHUB_REPOSITORY")
runNumber := os.Getenv("GITHUB_RUN_NUMBER") runNumber := os.Getenv("GITHUB_RUN_NUMBER")
@ -29,6 +33,7 @@ func Run(conf conf.Conf) error {
repoParts := strings.Split(repository, "/") repoParts := strings.Split(repository, "/")
repoName := repoParts[1] repoName := repoParts[1]
re := regexp.MustCompile(`\x1b\[[0-9;]*[a-zA-Z]`) re := regexp.MustCompile(`\x1b\[[0-9;]*[a-zA-Z]`)
if !conf.Teapot.SkipScoreboard {
cmd := exec.Command("joint-teapot", "joj3-scoreboard", cmd := exec.Command("joint-teapot", "joj3-scoreboard",
envFilePath, conf.Stage.OutputPath, actor, conf.Teapot.GradingRepoName, envFilePath, conf.Stage.OutputPath, actor, conf.Teapot.GradingRepoName,
repoName, runNumber, conf.Teapot.ScoreboardPath, conf.Name) // #nosec G204 repoName, runNumber, conf.Teapot.ScoreboardPath, conf.Name) // #nosec G204
@ -44,11 +49,13 @@ func Run(conf conf.Conf) error {
slog.Error("joint-teapot joj3-scoreboard", "err", err) slog.Error("joint-teapot joj3-scoreboard", "err", err)
return err return err
} }
cmd = exec.Command("joint-teapot", "joj3-failed-table", }
if !conf.Teapot.SkipFailedTable {
cmd := exec.Command("joint-teapot", "joj3-failed-table",
envFilePath, conf.Stage.OutputPath, actor, conf.Teapot.GradingRepoName, envFilePath, conf.Stage.OutputPath, actor, conf.Teapot.GradingRepoName,
repoName, runNumber, conf.Teapot.FailedTablePath, conf.Name) // #nosec G204 repoName, runNumber, conf.Teapot.FailedTablePath, conf.Name) // #nosec G204
outputBytes, err = cmd.CombinedOutput() outputBytes, err := cmd.CombinedOutput()
output = re.ReplaceAllString(string(outputBytes), "") output := re.ReplaceAllString(string(outputBytes), "")
for _, line := range strings.Split(output, "\n") { for _, line := range strings.Split(output, "\n") {
if line == "" { if line == "" {
continue continue
@ -59,10 +66,12 @@ func Run(conf conf.Conf) error {
slog.Error("joint-teapot joj3-failed-table", "err", err) slog.Error("joint-teapot joj3-failed-table", "err", err)
return err return err
} }
cmd = exec.Command("joint-teapot", "joj3-create-result-issue", }
if !conf.Teapot.SkipIssue {
cmd := exec.Command("joint-teapot", "joj3-create-result-issue",
envFilePath, conf.Stage.OutputPath, repoName, runNumber, conf.Name) // #nosec G204 envFilePath, conf.Stage.OutputPath, repoName, runNumber, conf.Name) // #nosec G204
outputBytes, err = cmd.CombinedOutput() outputBytes, err := cmd.CombinedOutput()
output = re.ReplaceAllString(string(outputBytes), "") output := re.ReplaceAllString(string(outputBytes), "")
for _, line := range strings.Split(output, "\n") { for _, line := range strings.Split(output, "\n") {
if line == "" { if line == "" {
continue continue
@ -73,5 +82,6 @@ func Run(conf conf.Conf) error {
slog.Error("joint-teapot joj3-create-result-issue", "err", err) slog.Error("joint-teapot joj3-create-result-issue", "err", err)
return err return err
} }
}
return nil return nil
} }