Icycoide/RSCC-Forge
1
0
Fork 0
forked from kevadesu/forgejo
Code Pull requests Activity

undo rebase conflicts

Browse source
This commit is contained in:
Michael Jerger 2024-02-09 17:00:21 +01:00
parent 3ef57385ec
commit 5fa62287d6
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
routers/api/actions/runner/runner.go
View file

@ -58,8 +58,8 @@ func (s *Service) Register(
// TODO: agent_labels should be removed from pb after Gitea 1.20 released.
// Old version runner's agent_labels slice is not empty and labels slice is empty.
// And due to compatibility with older versions, it is temporarily marked as Deprecated in pb, so use `//nolint` here.
if len(req.Msg.AgentLabels) > 0 && len(req.Msg.Labels) == 0 {
labels = req.Msg.AgentLabels
if len(req.Msg.AgentLabels) > 0 && len(req.Msg.Labels) == 0 { //nolint:staticcheck
labels = req.Msg.AgentLabels //nolint:staticcheck
}
// create new runner