0
0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-11 09:15:31 +02:00

Merge a1d0b57b1fd929737412578ca7956c2b599874f1 into ce089f498bce32305b2d9e8c6adfd8cb7c82f88f

This commit is contained in:
Nicolas 2026-05-09 09:29:43 +02:00 committed by GitHub
commit 54ad789566
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -12,6 +12,7 @@ import (
"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/modules/actions/jobparser"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
@ -215,6 +216,12 @@ func GetRunJobsByRunAndAttemptID(ctx context.Context, runID, runAttemptID int64)
if err := db.GetEngine(ctx).Where("run_id=? AND run_attempt_id=?", runID, runAttemptID).OrderBy("id").Find(&jobs); err != nil {
return nil, err
}
slices.SortStableFunc(jobs, func(a, b *ActionRunJob) int {
if cmp := base.NaturalSortCompare(a.JobID, b.JobID); cmp != 0 {
return cmp
}
return base.NaturalSortCompare(a.Name, b.Name)
})
return jobs, nil
}