Merge branch 'master' into feat/global_org_secrets

woodpecker-ci · Aug 2, 2022 · 88a368f · 88a368f
2 parents 59cf6d5 + 550aefe
commit 88a368f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -48,7 +48,6 @@ body:
         and copy paste the text instead.
 
         Tip: You can attach images by clicking this area to highlight it and then dragging files in.
-      render: shell
     validations:
       required: false
   - type: checkboxes

diff --git a/server/store/datastore/proc.go b/server/store/datastore/proc.go
@@ -44,7 +44,10 @@ func (s storage) ProcChild(build *model.Build, ppid int, child string) (*model.P
 
 func (s storage) ProcList(build *model.Build) ([]*model.Proc, error) {
 	procList := make([]*model.Proc, 0, perPage)
-	return procList, s.engine.Where("proc_build_id = ?", build.ID).Find(&procList)
+	return procList, s.engine.
+		Where("proc_build_id = ?", build.ID).
+		OrderBy("proc_pid").
+		Find(&procList)
 }
 
 func (s storage) ProcCreate(procs []*model.Proc) error {