Skip to content

Commit 4341ef0

Browse files
committed
remove some unused changes
1 parent 130f2a2 commit 4341ef0

File tree

2 files changed

+1
-24
lines changed

2 files changed

+1
-24
lines changed

models/actions/run_list.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ type FindRunOptions struct {
7171
TriggerEvent webhook_module.HookEventType
7272
Approved bool // not util.OptionalBool, it works only when it's true
7373
Status []Status
74-
SortType string
7574
ConcurrencyGroup string
7675
}
7776

@@ -108,14 +107,7 @@ func (opts FindRunOptions) ToConds() builder.Cond {
108107
}
109108

110109
func (opts FindRunOptions) ToOrders() string {
111-
switch opts.SortType {
112-
case "oldest":
113-
return "created ASC"
114-
case "newest":
115-
return "created DESC"
116-
default:
117-
return "`id` DESC"
118-
}
110+
return "`id` DESC"
119111
}
120112

121113
type StatusInfo struct {

routers/api/actions/runner/utils.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,3 @@ func findTaskNeeds(ctx context.Context, task *actions_model.ActionTask) (map[str
9292

9393
return ret, nil
9494
}
95-
96-
// mergeTwoOutputs merges two outputs from two different ActionRunJobs
97-
// Values with the same output name may be overridden. The user should ensure the output names are unique.
98-
// See https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#using-job-outputs-in-a-matrix-job
99-
func mergeTwoOutputs(o1, o2 map[string]string) map[string]string {
100-
ret := make(map[string]string, len(o1))
101-
for k1, v1 := range o1 {
102-
if len(v1) > 0 {
103-
ret[k1] = v1
104-
} else {
105-
ret[k1] = o2[k1]
106-
}
107-
}
108-
return ret
109-
}

0 commit comments

Comments
 (0)