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

feat(cmd/joj3): use triggering actor for teapot [force build]

Browse Source
This commit is contained in:
张泊明518370910136 2024-11-25 01:42:08 -05:00
parent 1d4b95bf81
commit b678654231
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
3 changed files with 15 additions and 13 deletions
Makefile
cmd/joj3
env
env.go
teapot
run.go

2
Makefile
View File

@ -31,4 +31,4 @@ test:
ci-test: ci-test:
./scripts/prepare_test_repos.sh $(TMP_DIR) ./scripts/prepare_test_repos.sh $(TMP_DIR)
./scripts/run_foreach_test_repos.sh $(TMP_DIR) "sed -i '2i \ \ \"sandboxExecServer\": \"172.17.0.1:5051\",' conf.json" ./scripts/run_foreach_test_repos.sh $(TMP_DIR) "sed -i '2i \ \ \"sandboxExecServer\": \"172.17.0.1:5051\",' conf.json"
GITHUB_ACTOR="" go test -coverprofile cover.out -v ./... GITHUB_TRIGGERING_ACTOR="" go test -coverprofile cover.out -v ./...

2
cmd/joj3/env/env.go vendored
View File

@ -10,6 +10,7 @@ type Attribute struct {
ConfName string ConfName string
RunID string RunID string
Actor string Actor string
TriggeringActor string
Repository string Repository string
Sha string Sha string
Ref string Ref string
@ -33,6 +34,7 @@ func init() {
combined ^= (combined << 16) combined ^= (combined << 16)
Attr.RunID = fmt.Sprintf("%08X", combined&0xFFFFFFFF) Attr.RunID = fmt.Sprintf("%08X", combined&0xFFFFFFFF)
Attr.Actor = os.Getenv("GITHUB_ACTOR") Attr.Actor = os.Getenv("GITHUB_ACTOR")
Attr.TriggeringActor = os.Getenv("GITHUB_TRIGGERING_ACTOR")
Attr.Repository = os.Getenv("GITHUB_REPOSITORY") Attr.Repository = os.Getenv("GITHUB_REPOSITORY")
Attr.Sha = os.Getenv("GITHUB_SHA") Attr.Sha = os.Getenv("GITHUB_SHA")
Attr.Ref = os.Getenv("GITHUB_REF") Attr.Ref = os.Getenv("GITHUB_REF")

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

@ -26,7 +26,7 @@ type TeapotResult struct {
func Run(conf *conf.Conf) (teapotResult TeapotResult, err error) { func Run(conf *conf.Conf) (teapotResult TeapotResult, err error) {
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")
if env.Attr.Actor == "" || if env.Attr.TriggeringActor == "" ||
env.Attr.Repository == "" || env.Attr.Repository == "" ||
strings.Count(env.Attr.Repository, "/") != 1 || strings.Count(env.Attr.Repository, "/") != 1 ||
env.Attr.RunNumber == "" { env.Attr.RunNumber == "" {
@ -58,7 +58,7 @@ func Run(conf *conf.Conf) (teapotResult TeapotResult, err error) {
env.Attr.Actor, conf.Teapot.GradingRepoName, repoName, env.Attr.Actor, conf.Teapot.GradingRepoName, repoName,
env.Attr.RunNumber, conf.Teapot.ScoreboardPath, env.Attr.RunNumber, conf.Teapot.ScoreboardPath,
conf.Teapot.FailedTablePath, conf.Teapot.FailedTablePath,
conf.Name, env.Attr.Sha, env.Attr.RunID, conf.Name, env.Attr.Sha, env.Attr.RunID, env.Attr.TriggeringActor,
"--max-total-score", strconv.Itoa(conf.MaxTotalScore), "--max-total-score", strconv.Itoa(conf.MaxTotalScore),
skipIssueArg, skipScoreboardArg, skipIssueArg, skipScoreboardArg,
skipFailedTableArg, submitterInIssueTitleArg, skipFailedTableArg, submitterInIssueTitleArg,