Compare commits
3 Commits
50b45df50b
...
eb77dc6fc4
Author | SHA1 | Date | |
---|---|---|---|
eb77dc6fc4 | |||
67e222aa59 | |||
1fe7e13c2c |
|
@ -20,6 +20,8 @@ type Conf struct {
|
|||
OutputPath string `default:"joj3_result.json"`
|
||||
GradingRepoName string `default:""`
|
||||
SkipTeapot bool `default:"true"`
|
||||
ScoreboardPath string `default:"scoreboard.csv"`
|
||||
FailedTablePath string `default:"failed-table.md"`
|
||||
Stages []struct {
|
||||
Name string
|
||||
Group string
|
||||
|
|
|
@ -5,6 +5,7 @@ import (
|
|||
"log/slog"
|
||||
"os"
|
||||
"os/exec"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/joint-online-judge/JOJ3/cmd/joj3/conf"
|
||||
|
@ -14,10 +15,6 @@ func Run(conf conf.Conf) error {
|
|||
if conf.SkipTeapot {
|
||||
return nil
|
||||
}
|
||||
for _, env := range os.Environ() {
|
||||
pair := strings.SplitN(env, "=", 2)
|
||||
slog.Info("env", "key", pair[0], "value", pair[1])
|
||||
}
|
||||
os.Setenv("LOG_FILE_PATH", "/home/tt/.cache/joint-teapot-debug.log")
|
||||
os.Setenv("_TYPER_STANDARD_TRACEBACK", "1")
|
||||
envFilePath := "/home/tt/.config/teapot/teapot.env"
|
||||
|
@ -31,28 +28,32 @@ func Run(conf conf.Conf) error {
|
|||
}
|
||||
repoParts := strings.Split(repository, "/")
|
||||
repoName := repoParts[1]
|
||||
re := regexp.MustCompile(`\x1b\[[0-9;]*[a-zA-Z]`)
|
||||
cmd := exec.Command("joint-teapot", "joj3-scoreboard",
|
||||
envFilePath, conf.OutputPath, actor, conf.GradingRepoName, repoName,
|
||||
runNumber) // #nosec G204
|
||||
output, err := cmd.CombinedOutput()
|
||||
slog.Info("joint-teapot joj3-scoreboard", "output", string(output))
|
||||
runNumber, conf.ScoreboardPath) // #nosec G204
|
||||
outputBytes, err := cmd.CombinedOutput()
|
||||
output := re.ReplaceAllString(string(outputBytes), "")
|
||||
slog.Info("joint-teapot joj3-scoreboard", "output", output)
|
||||
if err != nil {
|
||||
slog.Error("joint-teapot joj3-scoreboard", "err", err)
|
||||
return err
|
||||
}
|
||||
cmd = exec.Command("joint-teapot", "joj3-failed-table",
|
||||
envFilePath, conf.OutputPath, actor, conf.GradingRepoName, repoName,
|
||||
runNumber) // #nosec G204
|
||||
output, err = cmd.CombinedOutput()
|
||||
slog.Info("joint-teapot joj3-failed-table", "output", string(output))
|
||||
runNumber, conf.FailedTablePath) // #nosec G204
|
||||
outputBytes, err = cmd.CombinedOutput()
|
||||
output = re.ReplaceAllString(string(outputBytes), "")
|
||||
slog.Info("joint-teapot joj3-failed-table", "output", output)
|
||||
if err != nil {
|
||||
slog.Error("joint-teapot joj3-failed-table", "err", err)
|
||||
return err
|
||||
}
|
||||
cmd = exec.Command("joint-teapot", "joj3-create-result-issue",
|
||||
envFilePath, conf.OutputPath, repoName, runNumber) // #nosec G204
|
||||
output, err = cmd.CombinedOutput()
|
||||
slog.Info("joint-teapot joj3-create-result-issue", "output", string(output))
|
||||
outputBytes, err = cmd.CombinedOutput()
|
||||
output = re.ReplaceAllString(string(outputBytes), "")
|
||||
slog.Info("joint-teapot joj3-create-result-issue", "output", output)
|
||||
if err != nil {
|
||||
slog.Error("joint-teapot joj3-create-result-issue", "err", err)
|
||||
return err
|
||||
|
|
Loading…
Reference in New Issue
Block a user