oppi.li / perf-test
loading up the forgejo repo on tangled to test page performance
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Remove deprecated stuff for runners (#30930)

It's time (maybe somewhat late) to remove some deprecated stuff for the
runner.

- `x-runner-version`: runners needn't to report version in every
request, they will call `Declare`.
- `AgentLabels`: runners will report them as `Labels`.

(cherry picked from commit b9396a9b852e4fea0e2c39ef3ef2fdfbc9ea248a)

Conflicts:
routers/api/actions/runner/interceptor.go
trivial conflict because
e80466f734 Resolve lint for unused parameter and unnecessary type arguments (#30750)
was not cherry-picked

authored by

Jason Song and committed by
Earl Warren 38ea77eb 1a250c7b

-19
-13
routers/api/actions/runner/interceptor.go
··· 23 23 const ( 24 24 uuidHeaderKey = "x-runner-uuid" 25 25 tokenHeaderKey = "x-runner-token" 26 - // Deprecated: will be removed after Gitea 1.20 released. 27 - versionHeaderKey = "x-runner-version" 28 26 ) 29 27 30 28 var withRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unaryFunc connect.UnaryFunc) connect.UnaryFunc { ··· 35 33 } 36 34 uuid := request.Header().Get(uuidHeaderKey) 37 35 token := request.Header().Get(tokenHeaderKey) 38 - // TODO: version will be removed from request header after Gitea 1.20 released. 39 - // And Gitea will not try to read version from request header 40 - version := request.Header().Get(versionHeaderKey) 41 36 42 37 runner, err := actions_model.GetRunnerByUUID(ctx, uuid) 43 38 if err != nil { ··· 51 46 } 52 47 53 48 cols := []string{"last_online"} 54 - 55 - // TODO: version will be removed from request header after Gitea 1.20 released. 56 - // And Gitea will not try to read version from request header 57 - version, _ = util.SplitStringAtByteN(version, 64) 58 - if !util.IsEmptyString(version) && runner.Version != version { 59 - runner.Version = version 60 - cols = append(cols, "version") 61 - } 62 49 runner.LastOnline = timeutil.TimeStampNow() 63 50 if methodName == "UpdateTask" || methodName == "UpdateLog" { 64 51 runner.LastActive = timeutil.TimeStampNow()
-6
routers/api/actions/runner/runner.go
··· 69 69 } 70 70 71 71 labels := req.Msg.Labels 72 - // TODO: agent_labels should be removed from pb after Gitea 1.20 released. 73 - // Old version runner's agent_labels slice is not empty and labels slice is empty. 74 - // And due to compatibility with older versions, it is temporarily marked as Deprecated in pb, so use `//nolint` here. 75 - if len(req.Msg.AgentLabels) > 0 && len(req.Msg.Labels) == 0 { //nolint:staticcheck 76 - labels = req.Msg.AgentLabels //nolint:staticcheck 77 - } 78 72 79 73 // create new runner 80 74 name, _ := util.SplitStringAtByteN(req.Msg.Name, 255)