From b678654231979b1a031aea16ec06621423ceb0ed Mon Sep 17 00:00:00 2001
From: Boming Zhang <bomingzh@sjtu.edu.cn>
Date: Mon, 25 Nov 2024 01:42:08 -0500
Subject: [PATCH] feat(cmd/joj3): use triggering actor for teapot [force build]

---
 Makefile               |  2 +-
 cmd/joj3/env/env.go    | 22 ++++++++++++----------
 cmd/joj3/teapot/run.go |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index a9125fe..89108c7 100644
--- a/Makefile
+++ b/Makefile
@@ -31,4 +31,4 @@ test:
 ci-test:
 	./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"
-	GITHUB_ACTOR="" go test -coverprofile cover.out -v ./...
+	GITHUB_TRIGGERING_ACTOR="" go test -coverprofile cover.out -v ./...
diff --git a/cmd/joj3/env/env.go b/cmd/joj3/env/env.go
index 2b88321..0b4a67b 100644
--- a/cmd/joj3/env/env.go
+++ b/cmd/joj3/env/env.go
@@ -7,16 +7,17 @@ import (
 )
 
 type Attribute struct {
-	ConfName   string
-	RunID      string
-	Actor      string
-	Repository string
-	Sha        string
-	Ref        string
-	Workflow   string
-	RunNumber  string
-	ActorName  string
-	ActorID    string
+	ConfName        string
+	RunID           string
+	Actor           string
+	TriggeringActor string
+	Repository      string
+	Sha             string
+	Ref             string
+	Workflow        string
+	RunNumber       string
+	ActorName       string
+	ActorID         string
 }
 
 var Attr Attribute
@@ -33,6 +34,7 @@ func init() {
 	combined ^= (combined << 16)
 	Attr.RunID = fmt.Sprintf("%08X", combined&0xFFFFFFFF)
 	Attr.Actor = os.Getenv("GITHUB_ACTOR")
+	Attr.TriggeringActor = os.Getenv("GITHUB_TRIGGERING_ACTOR")
 	Attr.Repository = os.Getenv("GITHUB_REPOSITORY")
 	Attr.Sha = os.Getenv("GITHUB_SHA")
 	Attr.Ref = os.Getenv("GITHUB_REF")
diff --git a/cmd/joj3/teapot/run.go b/cmd/joj3/teapot/run.go
index 3170dd0..1b6437c 100644
--- a/cmd/joj3/teapot/run.go
+++ b/cmd/joj3/teapot/run.go
@@ -26,7 +26,7 @@ type TeapotResult struct {
 func Run(conf *conf.Conf) (teapotResult TeapotResult, err error) {
 	os.Setenv("LOG_FILE_PATH", conf.Teapot.LogPath)
 	os.Setenv("_TYPER_STANDARD_TRACEBACK", "1")
-	if env.Attr.Actor == "" ||
+	if env.Attr.TriggeringActor == "" ||
 		env.Attr.Repository == "" ||
 		strings.Count(env.Attr.Repository, "/") != 1 ||
 		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.RunNumber, conf.Teapot.ScoreboardPath,
 		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),
 		skipIssueArg, skipScoreboardArg,
 		skipFailedTableArg, submitterInIssueTitleArg,