TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: sourcehut_builds preserve unused fields

Browse source 
Fix #3820

(cherry picked from commit c9f38e2813)
This commit is contained in:
oliverpool 2024-05-22 10:09:58 +02:00 • committed by GitHub
parent 855f95f7a2
commit 287253ff7d
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
services/webhook/sourcehut/builds.go
View file

@ -270,18 +270,18 @@ func (pc sourcehutConvertor) buildManifest(repo *api.Repository, commitID, gitRe
} }
defer r.Close() defer r.Close()
var manifest struct { var manifest struct {
Image string `yaml:"image"` Image yaml.Node `yaml:"image"`
Arch string `yaml:"arch,omitempty"` Arch yaml.Node `yaml:"arch,omitempty"`
Packages []string `yaml:"packages,omitempty"` Packages yaml.Node `yaml:"packages,omitempty"`
Repositories map[string]string `yaml:"repositories,omitempty"` Repositories yaml.Node `yaml:"repositories,omitempty"`
Artifacts []string `yaml:"artifacts,omitempty"` Artifacts yaml.Node `yaml:"artifacts,omitempty"`
Shell bool `yaml:"shell,omitempty"` Shell yaml.Node `yaml:"shell,omitempty"`
Sources []string `yaml:"sources"` Sources []string `yaml:"sources"`
Tasks []map[string]string `yaml:"tasks"` Tasks yaml.Node `yaml:"tasks"`
Triggers []string `yaml:"triggers,omitempty"` Triggers yaml.Node `yaml:"triggers,omitempty"`
Environment map[string]string `yaml:"environment"` Environment map[string]string `yaml:"environment"`
Secrets []string `yaml:"secrets,omitempty"` Secrets yaml.Node `yaml:"secrets,omitempty"`
Oauth string `yaml:"oauth,omitempty"` Oauth yaml.Node `yaml:"oauth,omitempty"`
} }
if err := yaml.NewDecoder(r).Decode(&manifest); err != nil { if err := yaml.NewDecoder(r).Decode(&manifest); err != nil {
msg := fmt.Sprintf("could not decode manifest %q", pc.meta.ManifestPath) msg := fmt.Sprintf("could not decode manifest %q", pc.meta.ManifestPath)