Split and refactor (#1394)

Closes #974
This commit is contained in:
6543
2022-11-06 12:44:04 +01:00
committed by GitHub
parent e901f605b1
commit 18311d4360
35 changed files with 258 additions and 239 deletions

View File

@@ -19,14 +19,14 @@ import (
"encoding/json"
"fmt"
"github.com/woodpecker-ci/woodpecker/pipeline"
"github.com/woodpecker-ci/woodpecker/pipeline/rpc"
"github.com/woodpecker-ci/woodpecker/server"
"github.com/woodpecker-ci/woodpecker/server/model"
"github.com/woodpecker-ci/woodpecker/server/queue"
"github.com/woodpecker-ci/woodpecker/server/shared"
)
func queueBuild(pipeline *model.Pipeline, repo *model.Repo, pipelineItems []*shared.PipelineItem) error {
func queueBuild(pipeline *model.Pipeline, repo *model.Repo, pipelineItems []*pipeline.Item) error {
var tasks []*queue.Task
for _, item := range pipelineItems {
if item.Step.State == model.StatusSkipped {
@@ -58,7 +58,7 @@ func queueBuild(pipeline *model.Pipeline, repo *model.Repo, pipelineItems []*sha
return server.Config.Services.Queue.PushAtOnce(context.Background(), tasks)
}
func taskIds(dependsOn []string, pipelineItems []*shared.PipelineItem) (taskIds []string) {
func taskIds(dependsOn []string, pipelineItems []*pipeline.Item) (taskIds []string) {
for _, dep := range dependsOn {
for _, pipelineItem := range pipelineItems {
if pipelineItem.Step.Name == dep {