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

fix/forbidden (#58) #60

Merged
张泊明518370910136 merged 7 commits from fix/forbidden into master 2024-10-18 14:41:10 +08:00
Conversation 21 Commits 7 Files Changed 4 +14 -10
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 240cc571bd - Show all commits

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

@ -21,8 +21,7 @@ func Run(conf *conf.Conf) error {
os.Setenv("LOG_FILE_PATH", conf.Teapot.LogPath)
os.Setenv("_TYPER_STANDARD_TRACEBACK", "1")
envFilePath := "/home/tt/.config/teapot/teapot.env"
// TODO: pass sha to joint-teapot
// sha := os.Getenv("GITHUB_SHA")
sha := os.Getenv("GITHUB_SHA")
actor := os.Getenv("GITHUB_ACTOR")
repository := os.Getenv("GITHUB_REPOSITORY")
runNumber := os.Getenv("GITHUB_RUN_NUMBER")
@ -55,7 +54,7 @@ func Run(conf *conf.Conf) error {
err := execCommand("joint-teapot", []string{
"joj3-scoreboard", envFilePath, conf.Stage.OutputPath, actor,
conf.Teapot.GradingRepoName, repoName, runNumber,
conf.Teapot.ScoreboardPath, conf.Name,
conf.Teapot.ScoreboardPath, conf.Name, sha,
})
if err != nil {
scoreboardErr = err
@ -65,7 +64,7 @@ func Run(conf *conf.Conf) error {
err := execCommand("joint-teapot", []string{
"joj3-failed-table", envFilePath, conf.Stage.OutputPath, actor,
conf.Teapot.GradingRepoName, repoName, runNumber,
conf.Teapot.FailedTablePath, conf.Name,
conf.Teapot.FailedTablePath, conf.Name, sha,
})
if err != nil {
failedTableErr = err
@ -77,7 +76,7 @@ func Run(conf *conf.Conf) error {
if !conf.Teapot.SkipIssue {
err := execCommand("joint-teapot", []string{
"joj3-create-result-issue", envFilePath, conf.Stage.OutputPath,
repoName, runNumber, conf.Name,
repoName, runNumber, conf.Name, actor, sha,
})
if err != nil {
issueErr = err

4
internal/parser/clangtidy/convert.go
View File

@ -6,6 +6,7 @@ import (
"path/filepath"
"regexp"
"strconv"
"strings"
)
type Level int
@ -68,6 +69,9 @@ func levelFromString(levelString string) Level {
}
func isIgnored(line string) bool {
if strings.TrimSpace(line) == "" {
return true
}
ignoreRegex := regexp.MustCompile("^error:.*$")
return ignoreRegex.MatchString(line)
}

8
internal/parser/clangtidy/parser.go
View File

@ -24,11 +24,6 @@ type ClangTidy struct{}
func Parse(executorResult stage.ExecutorResult, conf Conf) stage.ParserResult {
stdout := executorResult.Files["stdout"]
stderr := executorResult.Files["stderr"]
lines := strings.SplitAfter(stdout, "\n")
messages := ParseLines(lines, conf)
formattedMessages := Format(messages)
if executorResult.Status != stage.Status(envexec.StatusAccepted) {
if !((executorResult.Status == stage.Status(envexec.StatusNonzeroExitStatus)) &&
(executorResult.ExitStatus == 1)) {
@ -41,6 +36,9 @@ func Parse(executorResult stage.ExecutorResult, conf Conf) stage.ParserResult {
}
}
}
lines := strings.SplitAfter(stdout, "\n")
messages := ParseLines(lines, conf)
formattedMessages := Format(messages)
score, comment := GetResult(formattedMessages, conf)
return stage.ParserResult{
Score: score,

3
internal/parser/resultdetail/parser.go
View File

@ -33,6 +33,9 @@ func (*ResultDetail) Run(results []stage.ExecutorResult, confAny any) (
comment += fmt.Sprintf("Exit Status: `%d`\n", result.ExitStatus)
}
if conf.ShowError {
if result.Error == "" {
result.Error = "nil"
}
comment += fmt.Sprintf("Error: `%s`\n", result.Error)
}
if conf.ShowTime {