merith-tk/runner
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

fix: labels from config.yml take precedence

Browse source 
Fixes: https://code.forgejo.org/forgejo/runner/issues/174
This commit is contained in:
Earl Warren 2024-04-09 12:24:24 +02:00
parent 8a2d4cb7cb
commit 43a8a402f4
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/pkg/config/registration.go
View file

@ -22,7 +22,7 @@ type Registration struct {
Labels []string `json:"labels"`
}
func LoadRegistration(file string) (*Registration, error) {
func LoadRegistration(file string, labels []string) (*Registration, error) {
f, err := os.Open(file)
if err != nil {
return nil, err
@ -34,6 +34,9 @@ func LoadRegistration(file string) (*Registration, error) {
return nil, err
}
if len(labels) > 0 {
reg.Labels = labels
}
reg.Warning = ""
return &reg, nil