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

feat(cmd/joj3): use joint-teapot joj3-all [force build]
All checks were successful
submodules sync / sync (push) Successful in 42s
Details
build / build (push) Successful in 1m35s
Details
build / trigger-build-image (push) Successful in 8s
Details

Browse Source
This commit is contained in:
张泊明518370910136 2024-10-27 05:13:20 -04:00
parent 555760bf1f
commit 0abca551ed
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
1 changed files with 17 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
cmd/joj3/teapot/run.go
View File

@ -64,53 +64,26 @@ func Run(conf *conf.Conf) error {
wg.Wait()
return err
}
var wg sync.WaitGroup
var scoreboardErr, failedTableErr, issueErr error
if !conf.Teapot.SkipScoreboard {
wg.Add(1)
go func() {
defer wg.Done()
err := execCommand("joint-teapot", []string{
"joj3-scoreboard", envFilePath, conf.Stage.OutputPath, actor,
conf.Teapot.GradingRepoName, repoName, runNumber,
conf.Teapot.ScoreboardPath, conf.Name, sha,
})
if err != nil {
scoreboardErr = err
}
}()
skipIssueArg := "--no-skip-result-issue"
if conf.Teapot.SkipIssue {
skipIssueArg = "--skip-result-issue"
}
if !conf.Teapot.SkipFailedTable {
wg.Add(1)
go func() {
defer wg.Done()
err := execCommand("joint-teapot", []string{
"joj3-failed-table", envFilePath, conf.Stage.OutputPath, actor,
conf.Teapot.GradingRepoName, repoName, runNumber,
conf.Teapot.FailedTablePath, conf.Name, sha,
})
if err != nil {
failedTableErr = err
}
}()
skipScoreboardArg := "--no-skip-scoreboard"
if conf.Teapot.SkipScoreboard {
skipScoreboardArg = "--skip-scoreboard"
}
if !conf.Teapot.SkipIssue {
wg.Add(1)
go func() {
defer wg.Done()
err := execCommand("joint-teapot", []string{
"joj3-create-result-issue", envFilePath, conf.Stage.OutputPath,
repoName, runNumber, conf.Name, actor, sha,
})
if err != nil {
issueErr = err
}
}()
skipFailedTableArg := "--no-skip-failed-table"
if conf.Teapot.SkipFailedTable {
skipFailedTableArg = "--skip-failed-table"
}
wg.Wait()
if scoreboardErr != nil || failedTableErr != nil || issueErr != nil {
slog.Error("teapot exit", "scoreboardErr", scoreboardErr,
"failedTableErr", failedTableErr, "issueErr", issueErr)
if err := execCommand("joint-teapot", []string{
"joj3-all", envFilePath, conf.Stage.OutputPath, actor,
conf.Teapot.GradingRepoName, repoName, runNumber,
conf.Teapot.ScoreboardPath, conf.Teapot.FailedTablePath,
conf.Name, sha, skipIssueArg, skipScoreboardArg,
skipFailedTableArg,
}); err != nil {
slog.Error("teapot exit", "error", err)
return fmt.Errorf("teapot exit")
}
return nil