github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-09-20 03:59:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Anbraten
2025-03-26 23:44:40 +01:00
parent 52b1f24e2b
commit 5bcc5b14c8
4 changed files with 15 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pipeline/frontend/yaml/stepbuilder/step_builder.go
View File

@@ -50,14 +50,6 @@ type StepBuilder struct {
DefaultLabels map[string]string DefaultLabels map[string]string
} }
type Item struct {
Workflow *model.Workflow
Labels map[string]string
DependsOn []string
RunsOn []string
Config *backend_types.Config
}
func (b *StepBuilder) Build() (items []*Item, errorsAndWarnings error) { func (b *StepBuilder) Build() (items []*Item, errorsAndWarnings error) {
b.Yamls = forge_types.SortByName(b.Yamls) b.Yamls = forge_types.SortByName(b.Yamls)
@@ -201,7 +193,7 @@ func (b *StepBuilder) compileWorkflow(parsed *yaml_types.Workflow, environ map[s
compiler.WithEnviron(environ), compiler.WithEnviron(environ),
compiler.WithEnviron(b.Envs), compiler.WithEnviron(b.Envs),
compiler.WithEscalated(b.PrivilegedPlugins...), compiler.WithEscalated(b.PrivilegedPlugins...),
compiler.WithTrustedClonePlugins(b.TrustedClonePlugins), // TODO: append repo trusted clone plugins compiler.WithTrustedClonePlugins(b.TrustedClonePlugins),
compiler.WithPrefix( compiler.WithPrefix(
fmt.Sprintf( fmt.Sprintf(
"wp_%s_%d", "wp_%s_%d",

4
pipeline/frontend/yaml/stepbuilder/types.go
View File

@@ -1,8 +1,8 @@
package stepbuilder package stepbuilder
import ( import (
backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types"
"go.woodpecker-ci.org/woodpecker/v2/server/model" "go.woodpecker-ci.org/woodpecker/v3/server/model"
) )
type Item struct { type Item struct {

24
server/pipeline/items.go
View File

@@ -66,21 +66,6 @@ func parsePipeline(forge forge.Forge, store store.Store, currentPipeline *model.
}) })
} }
var secrets []compiler.Secret
for _, sec := range secs {
var events []string
for _, event := range sec.Events {
events = append(events, string(event))
}
secrets = append(secrets, compiler.Secret{
Name: sec.Name,
Value: sec.Value,
AllowedPlugins: sec.Images,
Events: events,
})
}
registryService := server.Config.Services.Manager.RegistryServiceFromRepo(repo) registryService := server.Config.Services.Manager.RegistryServiceFromRepo(repo)
regs, err := registryService.RegistryListPipeline(repo, currentPipeline) regs, err := registryService.RegistryListPipeline(repo, currentPipeline)
if err != nil { if err != nil {
@@ -95,15 +80,6 @@ func parsePipeline(forge forge.Forge, store store.Store, currentPipeline *model.
}) })
} }
var registries []compiler.Registry
for _, reg := range regs {
registries = append(registries, compiler.Registry{
Hostname: reg.Address,
Username: reg.Username,
Password: reg.Password,
})
}
if envs == nil { if envs == nil {
envs = map[string]string{} envs = map[string]string{}
} }

24
server/pipeline/metadata/metadata.go
View File

@@ -33,15 +33,15 @@ func MetadataFromStruct(forge metadata.ServerForge, repo *model.Repo, pipeline,
} }
fForge := metadata.Forge{} fForge := metadata.Forge{}
if m.forge != nil { if forge != nil {
fForge = metadata.Forge{ fForge = metadata.Forge{
Type: m.forge.Name(), Type: forge.Name(),
URL: m.forge.URL(), URL: forge.URL(),
} }
} }
fRepo := metadata.Repo{} fRepo := metadata.Repo{}
if m.repo != nil { if repo != nil {
fRepo = metadata.Repo{ fRepo = metadata.Repo{
ID: repo.ID, ID: repo.ID,
Name: repo.Name, Name: repo.Name,
@@ -53,18 +53,18 @@ func MetadataFromStruct(forge metadata.ServerForge, repo *model.Repo, pipeline,
Private: repo.IsSCMPrivate, Private: repo.IsSCMPrivate,
Branch: repo.Branch, Branch: repo.Branch,
Trusted: metadata.TrustedConfiguration{ Trusted: metadata.TrustedConfiguration{
Network: m.repo.Trusted.Network, Network: repo.Trusted.Network,
Volumes: m.repo.Trusted.Volumes, Volumes: repo.Trusted.Volumes,
Security: m.repo.Trusted.Security, Security: repo.Trusted.Security,
}, },
} }
if idx := strings.LastIndex(m.repo.FullName, "/"); idx != -1 { if idx := strings.LastIndex(repo.FullName, "/"); idx != -1 {
if fRepo.Name == "" && m.repo.FullName != "" { if fRepo.Name == "" && repo.FullName != "" {
fRepo.Name = m.repo.FullName[idx+1:] fRepo.Name = repo.FullName[idx+1:]
} }
if fRepo.Owner == "" && m.repo.FullName != "" { if fRepo.Owner == "" && repo.FullName != "" {
fRepo.Owner = m.repo.FullName[:idx] fRepo.Owner = repo.FullName[:idx]
} }
} }
} }