feat: add IsForkPullRequest

models/bots/run.go

@@ -24,26 +24,25 @@ import (
 
 // Run represents a run of a workflow file
 type Run struct {
-	ID            int64
-	Title         string
-	RepoID        int64                  `xorm:"index unique(repo_index)"`
-	Repo          *repo_model.Repository `xorm:"-"`
-	OwnerID       int64                  `xorm:"index"`
-	WorkflowID    string                 `xorm:"index"`                    // the name of workflow file
-	Index         int64                  `xorm:"index unique(repo_index)"` // a unique number for each run of a repository
-	TriggerUserID int64
-	TriggerUser   *user_model.User `xorm:"-"`
-	Ref           string
-	CommitSHA     string
-	Event         webhook.HookEventType
-	Token         string // token for this task
-	Grant         string // permissions for this task
-	EventPayload  string `xorm:"LONGTEXT"`
-	Status        Status `xorm:"index"`
-	Started       timeutil.TimeStamp
-	Stopped       timeutil.TimeStamp
-	Created       timeutil.TimeStamp `xorm:"created"`
-	Updated       timeutil.TimeStamp `xorm:"updated"`
+	ID                int64
+	Title             string
+	RepoID            int64                  `xorm:"index unique(repo_index)"`
+	Repo              *repo_model.Repository `xorm:"-"`
+	OwnerID           int64                  `xorm:"index"`
+	WorkflowID        string                 `xorm:"index"`                    // the name of workflow file
+	Index             int64                  `xorm:"index unique(repo_index)"` // a unique number for each run of a repository
+	TriggerUserID     int64
+	TriggerUser       *user_model.User `xorm:"-"`
+	Ref               string
+	CommitSHA         string
+	IsForkPullRequest bool
+	Event             webhook.HookEventType
+	EventPayload      string `xorm:"LONGTEXT"`
+	Status            Status `xorm:"index"`
+	Started           timeutil.TimeStamp
+	Stopped           timeutil.TimeStamp
+	Created           timeutil.TimeStamp `xorm:"created"`
+	Updated           timeutil.TimeStamp `xorm:"updated"`
 }
 
 func init() {
@@ -179,16 +178,17 @@ func InsertRun(run *Run, jobs []*jobparser.SingleWorkflow) error {
 			status = StatusBlocked
 		}
 		runJobs = append(runJobs, &RunJob{
-			RunID:           run.ID,
-			RepoID:          run.RepoID,
-			OwnerID:         run.OwnerID,
-			CommitSHA:       run.CommitSHA,
-			Name:            job.Name,
-			WorkflowPayload: payload,
-			JobID:           id,
-			Needs:           needs,
-			RunsOn:          job.RunsOn(),
-			Status:          status,
+			RunID:             run.ID,
+			RepoID:            run.RepoID,
+			OwnerID:           run.OwnerID,
+			CommitSHA:         run.CommitSHA,
+			IsForkPullRequest: run.IsForkPullRequest,
+			Name:              job.Name,
+			WorkflowPayload:   payload,
+			JobID:             id,
+			Needs:             needs,
+			RunsOn:            job.RunsOn(),
+			Status:            status,
 		})
 	}
 	if err := db.Insert(ctx, runJobs); err != nil {

models/bots/run_job.go

@@ -18,24 +18,25 @@ import (
 
 // RunJob represents a job of a run
 type RunJob struct {
-	ID              int64
-	RunID           int64  `xorm:"index"`
-	Run             *Run   `xorm:"-"`
-	RepoID          int64  `xorm:"index"`
-	OwnerID         int64  `xorm:"index"`
-	CommitSHA       string `xorm:"index"`
-	Name            string
-	Attempt         int64
-	WorkflowPayload []byte
-	JobID           string   // job id in workflow, not job's id
-	Needs           []string `xorm:"JSON TEXT"`
-	RunsOn          []string `xorm:"JSON TEXT"`
-	TaskID          int64    // the latest task of the job
-	Status          Status   `xorm:"index"`
-	Started         timeutil.TimeStamp
-	Stopped         timeutil.TimeStamp
-	Created         timeutil.TimeStamp `xorm:"created"`
-	Updated         timeutil.TimeStamp `xorm:"updated index"`
+	ID                int64
+	RunID             int64  `xorm:"index"`
+	Run               *Run   `xorm:"-"`
+	RepoID            int64  `xorm:"index"`
+	OwnerID           int64  `xorm:"index"`
+	CommitSHA         string `xorm:"index"`
+	IsForkPullRequest bool
+	Name              string
+	Attempt           int64
+	WorkflowPayload   []byte
+	JobID             string   // job id in workflow, not job's id
+	Needs             []string `xorm:"JSON TEXT"`
+	RunsOn            []string `xorm:"JSON TEXT"`
+	TaskID            int64    // the latest task of the job
+	Status            Status   `xorm:"index"`
+	Started           timeutil.TimeStamp
+	Stopped           timeutil.TimeStamp
+	Created           timeutil.TimeStamp `xorm:"created"`
+	Updated           timeutil.TimeStamp `xorm:"updated index"`
 }
 
 func init() {

models/bots/task.go

@@ -43,9 +43,10 @@ type Task struct {
 	Started  timeutil.TimeStamp `xorm:"index"`
 	Stopped  timeutil.TimeStamp
 
-	RepoID    int64  `xorm:"index"`
-	OwnerID   int64  `xorm:"index"`
-	CommitSHA string `xorm:"index"`
+	RepoID            int64  `xorm:"index"`
+	OwnerID           int64  `xorm:"index"`
+	CommitSHA         string `xorm:"index"`
+	IsForkPullRequest bool
 
 	Token          string `xorm:"-"`
 	TokenHash      string `xorm:"UNIQUE"` // sha256 of token
@@ -337,14 +338,15 @@ func CreateTaskForRunner(ctx context.Context, runner *Runner) (*Task, bool, erro
 	job.Status = StatusRunning
 
 	task := &Task{
-		JobID:     job.ID,
-		Attempt:   job.Attempt,
-		RunnerID:  runner.ID,
-		Started:   now,
-		Status:    StatusRunning,
-		RepoID:    job.RepoID,
-		OwnerID:   job.OwnerID,
-		CommitSHA: job.CommitSHA,
+		JobID:             job.ID,
+		Attempt:           job.Attempt,
+		RunnerID:          runner.ID,
+		Started:           now,
+		Status:            StatusRunning,
+		RepoID:            job.RepoID,
+		OwnerID:           job.OwnerID,
+		CommitSHA:         job.CommitSHA,
+		IsForkPullRequest: job.IsForkPullRequest,
 	}
 	if err := task.GenerateToken(); err != nil {
 		return nil, false, err

models/issues/pull.go

@@ -418,6 +418,11 @@ func (pr *PullRequest) IsAncestor() bool {
 	return pr.Status == PullRequestStatusAncestor
 }
 
+// IsFromFork return true if this PR is from a fork.
+func (pr *PullRequest) IsFromFork() bool {
+	return pr.HeadRepoID != pr.BaseRepoID
+}
+
 // SetMerged sets a pull request to merged and closes the corresponding issue
 func (pr *PullRequest) SetMerged(ctx context.Context) (bool, error) {
 	if pr.HasMerged {

models/migrations/v-dev.go

@@ -53,44 +53,44 @@ func addBotTables(x *xorm.Engine) error {
 	}
 
 	type BotsRun struct {
-		ID            int64
-		Title         string
-		RepoID        int64  `xorm:"index unique(repo_index)"`
-		OwnerID       int64  `xorm:"index"`
-		WorkflowID    string `xorm:"index"`                    // the name of workflow file
-		Index         int64  `xorm:"index unique(repo_index)"` // a unique number for each run of a repository
-		TriggerUserID int64
-		Ref           string
-		CommitSHA     string
-		Event         string
-		Token         string // token for this task
-		Grant         string // permissions for this task
-		EventPayload  string `xorm:"LONGTEXT"`
-		Status        int    `xorm:"index"`
-		Started       timeutil.TimeStamp
-		Stopped       timeutil.TimeStamp
-		Created       timeutil.TimeStamp `xorm:"created"`
-		Updated       timeutil.TimeStamp `xorm:"updated"`
+		ID                int64
+		Title             string
+		RepoID            int64  `xorm:"index unique(repo_index)"`
+		OwnerID           int64  `xorm:"index"`
+		WorkflowID        string `xorm:"index"`                    // the name of workflow file
+		Index             int64  `xorm:"index unique(repo_index)"` // a unique number for each run of a repository
+		TriggerUserID     int64
+		Ref               string
+		CommitSHA         string
+		Event             string
+		IsForkPullRequest bool
+		EventPayload      string `xorm:"LONGTEXT"`
+		Status            int    `xorm:"index"`
+		Started           timeutil.TimeStamp
+		Stopped           timeutil.TimeStamp
+		Created           timeutil.TimeStamp `xorm:"created"`
+		Updated           timeutil.TimeStamp `xorm:"updated"`
 	}
 
 	type BotsRunJob struct {
-		ID              int64
-		RunID           int64  `xorm:"index"`
-		RepoID          int64  `xorm:"index"`
-		OwnerID         int64  `xorm:"index"`
-		CommitSHA       string `xorm:"index"`
-		Name            string
-		Attempt         int64
-		WorkflowPayload []byte
-		JobID           string   // job id in workflow, not job's id
-		Needs           []string `xorm:"JSON TEXT"`
-		RunsOn          []string `xorm:"JSON TEXT"`
-		TaskID          int64    // the latest task of the job
-		Status          int      `xorm:"index"`
-		Started         timeutil.TimeStamp
-		Stopped         timeutil.TimeStamp
-		Created         timeutil.TimeStamp `xorm:"created"`
-		Updated         timeutil.TimeStamp `xorm:"updated index"`
+		ID                int64
+		RunID             int64  `xorm:"index"`
+		RepoID            int64  `xorm:"index"`
+		OwnerID           int64  `xorm:"index"`
+		CommitSHA         string `xorm:"index"`
+		IsForkPullRequest bool
+		Name              string
+		Attempt           int64
+		WorkflowPayload   []byte
+		JobID             string   // job id in workflow, not job's id
+		Needs             []string `xorm:"JSON TEXT"`
+		RunsOn            []string `xorm:"JSON TEXT"`
+		TaskID            int64    // the latest task of the job
+		Status            int      `xorm:"index"`
+		Started           timeutil.TimeStamp
+		Stopped           timeutil.TimeStamp
+		Created           timeutil.TimeStamp `xorm:"created"`
+		Updated           timeutil.TimeStamp `xorm:"updated index"`
 	}
 
 	type Repository struct {
@@ -109,9 +109,10 @@ func addBotTables(x *xorm.Engine) error {
 		Started  timeutil.TimeStamp `xorm:"index"`
 		Stopped  timeutil.TimeStamp
 
-		RepoID    int64  `xorm:"index"`
-		OwnerID   int64  `xorm:"index"`
-		CommitSHA string `xorm:"index"`
+		RepoID            int64  `xorm:"index"`
+		OwnerID           int64  `xorm:"index"`
+		CommitSHA         string `xorm:"index"`
+		IsForkPullRequest bool
 
 		TokenHash      string `xorm:"UNIQUE"` // sha256 of token
 		TokenSalt      string