github/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-28 14:59:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix lint

Browse Source
This commit is contained in:
Zettat123 2025-07-23 11:56:35 -06:00
parent ca186724dd
commit dc003e40fc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
services/actions/job_emitter.go
View File

@ -126,12 +126,12 @@ func checkRunConcurrency(ctx context.Context, run *actions_model.ActionRun) (job
return nil, nil, fmt.Errorf("find blocked run by concurrency: %w", err) return nil, nil, fmt.Errorf("find blocked run by concurrency: %w", err)
} }
if found && !concurrentRun.NeedApproval { if found && !concurrentRun.NeedApproval {
if js, ujs, err := checkJobsOfRun(ctx, concurrentRun); err != nil { js, ujs, err := checkJobsOfRun(ctx, concurrentRun)
if err != nil {
return nil, nil, err return nil, nil, err
} else {
jobs = append(jobs, js...)
updatedJobs = append(updatedJobs, ujs...)
} }
jobs = append(jobs, js...)
updatedJobs = append(updatedJobs, ujs...)
} }
checkedConcurrencyGroup.Add(run.ConcurrencyGroup) checkedConcurrencyGroup.Add(run.ConcurrencyGroup)
} }
@ -153,16 +153,16 @@ func checkRunConcurrency(ctx context.Context, run *actions_model.ActionRun) (job
return nil, nil, fmt.Errorf("find blocked run by concurrency: %w", err) return nil, nil, fmt.Errorf("find blocked run by concurrency: %w", err)
} }
if found && !concurrentRun.NeedApproval { if found && !concurrentRun.NeedApproval {
if js, ujs, err := checkJobsOfRun(ctx, concurrentRun); err != nil { js, ujs, err := checkJobsOfRun(ctx, concurrentRun)
if err != nil {
return nil, nil, err return nil, nil, err
} else {
jobs = append(jobs, js...)
updatedJobs = append(updatedJobs, ujs...)
} }
jobs = append(jobs, js...)
updatedJobs = append(updatedJobs, ujs...)
} }
checkedConcurrencyGroup.Add(job.ConcurrencyGroup) checkedConcurrencyGroup.Add(job.ConcurrencyGroup)
} }
return return jobs, updatedJobs, nil
} }
func checkJobsOfRun(ctx context.Context, run *actions_model.ActionRun) (jobs, updatedJobs []*actions_model.ActionRunJob, err error) { func checkJobsOfRun(ctx context.Context, run *actions_model.ActionRun) (jobs, updatedJobs []*actions_model.ActionRunJob, err error) {