oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-09-15 18:57:01 +00:00
Code Wiki Activity

fix!: default to node:22-bookworm instead of node:20-bullseye (#686)

Browse source 
Closes forgejo/runner#134

Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/686
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Co-authored-by: Earl Warren <contact@earl-warren.org>
Co-committed-by: Earl Warren <contact@earl-warren.org>
This commit is contained in:
Earl Warren 2025-07-12 09:36:58 +00:00 • committed by earl-warren
parent ec05ed930f
commit f0090d8ac7
No known key found for this signature in database
GPG key ID: F128CBE6AB3A7201
3 changed files with 74 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

42
internal/pkg/labels/labels.go
View file

@ -9,9 +9,13 @@ import (
)
const (
SchemeHost = "host"
SchemeHost = "host"
SchemeDocker = "docker"
SchemeLXC = "lxc"
ArgDocker = "//node:22-bookworm"
SchemeLXC = "lxc"
ArgLXC = "//debian:bookworm"
)
type Label struct {
@ -24,18 +28,32 @@ func Parse(str string) (*Label, error) {
splits := strings.SplitN(str, ":", 3)
label := &Label{
Name: splits[0],
Schema: "host",
Arg: "",
Schema: "docker",
}
if len(splits) >= 2 {
label.Schema = splits[1]
if label.Schema != SchemeHost && label.Schema != SchemeDocker && label.Schema != SchemeLXC {
return nil, fmt.Errorf("unsupported schema: %s", label.Schema)
}
}
if len(splits) >= 3 {
if label.Schema == SchemeHost {
return nil, fmt.Errorf("schema: %s does not have arguments", label.Schema)
}
label.Arg = splits[2]
}
if label.Schema != SchemeHost && label.Schema != SchemeDocker && label.Schema != SchemeLXC {
return nil, fmt.Errorf("unsupported schema: %s", label.Schema)
if label.Arg == "" {
switch label.Schema {
case SchemeDocker:
label.Arg = ArgDocker
case SchemeLXC:
label.Arg = ArgLXC
}
}
return label, nil
}
@ -72,17 +90,7 @@ func (l Labels) PickPlatform(runsOn []string) string {
}
}
// TODO: support multiple labels
// like:
// ["ubuntu-22.04"] => "ubuntu:22.04"
// ["with-gpu"] => "linux:with-gpu"
// ["ubuntu-22.04", "with-gpu"] => "ubuntu:22.04_with-gpu"
// return default.
// So the runner receives a task with a label that the runner doesn't have,
// it happens when the user have edited the label of the runner in the web UI.
// TODO: it may be not correct, what if the runner is used as host mode only?
return "node:20-bullseye"
return strings.TrimPrefix(ArgDocker, "//")
}
func (l Labels) Names() []string {