From 3e8db31a5b5a7be731b19da4bd666b0ddc35bd31 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 29 Mar 2023 23:27:37 +0800 Subject: Refactor commit status for Actions jobs (#23786) Before: xnip_230329_163852 After: xnip_230329_163358 Highlights: - Treat `StatusSkipped` as `CommitStatusSuccess` instead of `CommitStatusFailure`, so it fixed #23599. - Use the bot user `gitea-actions` instead of the trigger as the creator of commit status. - New format ` / / ()` for the context of commit status to avoid conflicts. - Add descriptions for commit status. - Add the missing calls to `CreateCommitStatus`. - Refactor `CreateCommitStatus` to make it easier to use. --- services/actions/job_emitter.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'services/actions/job_emitter.go') diff --git a/services/actions/job_emitter.go b/services/actions/job_emitter.go index cb2cc8d1ac..c6b6fc551e 100644 --- a/services/actions/job_emitter.go +++ b/services/actions/job_emitter.go @@ -45,11 +45,11 @@ func jobEmitterQueueHandle(data ...queue.Data) []queue.Data { } func checkJobsOfRun(ctx context.Context, runID int64) error { - return db.WithTx(ctx, func(ctx context.Context) error { - jobs, _, err := actions_model.FindRunJobs(ctx, actions_model.FindRunJobOptions{RunID: runID}) - if err != nil { - return err - } + jobs, _, err := actions_model.FindRunJobs(ctx, actions_model.FindRunJobOptions{RunID: runID}) + if err != nil { + return err + } + if err := db.WithTx(ctx, func(ctx context.Context) error { idToJobs := make(map[string][]*actions_model.ActionRunJob, len(jobs)) for _, job := range jobs { idToJobs[job.JobID] = append(idToJobs[job.JobID], job) @@ -67,7 +67,11 @@ func checkJobsOfRun(ctx context.Context, runID int64) error { } } return nil - }) + }); err != nil { + return err + } + CreateCommitStatus(ctx, jobs...) + return nil } type jobStatusResolver struct { -- cgit v1.2.3