mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-12-23 08:56:29 +00:00
Handling zero-step pipelines as multi-pipeline depedencies
This commit is contained in:
parent
ed51df29b3
commit
6879bf62cb
2 changed files with 91 additions and 10 deletions
|
@ -133,9 +133,44 @@ func (b *procBuilder) Build() ([]*buildItem, error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
items = filterItemsWithMissingDependencies(items)
|
||||||
|
|
||||||
return items, nil
|
return items, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func filterItemsWithMissingDependencies(items []*buildItem) []*buildItem {
|
||||||
|
itemsToRemove := make([]*buildItem, 0)
|
||||||
|
|
||||||
|
for _, item := range items {
|
||||||
|
for _, dep := range item.DependsOn {
|
||||||
|
if !containsItemWithName(dep, items) {
|
||||||
|
itemsToRemove = append(itemsToRemove, item)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(itemsToRemove) > 0 {
|
||||||
|
filtered := make([]*buildItem, 0)
|
||||||
|
for _, item := range items {
|
||||||
|
if !containsItemWithName(item.Proc.Name, itemsToRemove) {
|
||||||
|
filtered = append(filtered, item)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return filtered
|
||||||
|
}
|
||||||
|
|
||||||
|
return items
|
||||||
|
}
|
||||||
|
|
||||||
|
func containsItemWithName(name string, items []*buildItem) bool {
|
||||||
|
for _, item := range items {
|
||||||
|
if name == item.Proc.Name {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
func (b *procBuilder) envsubst_(y string, environ map[string]string) (string, error) {
|
func (b *procBuilder) envsubst_(y string, environ map[string]string) (string, error) {
|
||||||
return envsubst.Eval(y, func(name string) string {
|
return envsubst.Eval(y, func(name string) string {
|
||||||
env := environ[name]
|
env := environ[name]
|
||||||
|
|
|
@ -70,13 +70,11 @@ func TestMultiPipeline(t *testing.T) {
|
||||||
pipeline:
|
pipeline:
|
||||||
xxx:
|
xxx:
|
||||||
image: scratch
|
image: scratch
|
||||||
yyy: ${DRONE_COMMIT_MESSAGE}
|
|
||||||
`)},
|
`)},
|
||||||
&remote.FileMeta{Data: []byte(`
|
&remote.FileMeta{Data: []byte(`
|
||||||
pipeline:
|
pipeline:
|
||||||
build:
|
build:
|
||||||
image: scratch
|
image: scratch
|
||||||
yyy: ${DRONE_COMMIT_MESSAGE}
|
|
||||||
`)},
|
`)},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -100,6 +98,16 @@ func TestDependsOn(t *testing.T) {
|
||||||
Regs: []*model.Registry{},
|
Regs: []*model.Registry{},
|
||||||
Link: "",
|
Link: "",
|
||||||
Yamls: []*remote.FileMeta{
|
Yamls: []*remote.FileMeta{
|
||||||
|
&remote.FileMeta{Name: "lint", Data: []byte(`
|
||||||
|
pipeline:
|
||||||
|
build:
|
||||||
|
image: scratch
|
||||||
|
`)},
|
||||||
|
&remote.FileMeta{Name: "test", Data: []byte(`
|
||||||
|
pipeline:
|
||||||
|
build:
|
||||||
|
image: scratch
|
||||||
|
`)},
|
||||||
&remote.FileMeta{Data: []byte(`
|
&remote.FileMeta{Data: []byte(`
|
||||||
pipeline:
|
pipeline:
|
||||||
deploy:
|
deploy:
|
||||||
|
@ -108,7 +116,6 @@ pipeline:
|
||||||
depends_on:
|
depends_on:
|
||||||
- lint
|
- lint
|
||||||
- test
|
- test
|
||||||
- build
|
|
||||||
`)},
|
`)},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -117,7 +124,7 @@ depends_on:
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
if len(buildItems[0].DependsOn) != 3 {
|
if len(buildItems[0].DependsOn) != 2 {
|
||||||
t.Fatal("Should have 3 dependencies")
|
t.Fatal("Should have 3 dependencies")
|
||||||
}
|
}
|
||||||
if buildItems[0].DependsOn[1] != "test" {
|
if buildItems[0].DependsOn[1] != "test" {
|
||||||
|
@ -173,14 +180,12 @@ func TestBranchFilter(t *testing.T) {
|
||||||
pipeline:
|
pipeline:
|
||||||
xxx:
|
xxx:
|
||||||
image: scratch
|
image: scratch
|
||||||
yyy: ${DRONE_COMMIT_MESSAGE}
|
|
||||||
branches: master
|
branches: master
|
||||||
`)},
|
`)},
|
||||||
&remote.FileMeta{Data: []byte(`
|
&remote.FileMeta{Data: []byte(`
|
||||||
pipeline:
|
pipeline:
|
||||||
build:
|
build:
|
||||||
image: scratch
|
image: scratch
|
||||||
yyy: ${DRONE_COMMIT_MESSAGE}
|
|
||||||
`)},
|
`)},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -224,7 +229,6 @@ pipeline:
|
||||||
when:
|
when:
|
||||||
branch: notdev
|
branch: notdev
|
||||||
image: scratch
|
image: scratch
|
||||||
yyy: ${DRONE_COMMIT_MESSAGE}
|
|
||||||
`)},
|
`)},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -236,8 +240,51 @@ pipeline:
|
||||||
if len(buildItems) != 0 {
|
if len(buildItems) != 0 {
|
||||||
t.Fatal("Should not generate a build item if there are no steps")
|
t.Fatal("Should not generate a build item if there are no steps")
|
||||||
}
|
}
|
||||||
if len(build.Procs) != 0 {
|
}
|
||||||
t.Fatal("Should not generate a build item if there are no steps")
|
|
||||||
|
func TestZeroStepsAsMultiPipelineDeps(t *testing.T) {
|
||||||
|
build := &model.Build{Branch: "dev"}
|
||||||
|
|
||||||
|
b := procBuilder{
|
||||||
|
Repo: &model.Repo{},
|
||||||
|
Curr: build,
|
||||||
|
Last: &model.Build{},
|
||||||
|
Netrc: &model.Netrc{},
|
||||||
|
Secs: []*model.Secret{},
|
||||||
|
Regs: []*model.Registry{},
|
||||||
|
Link: "",
|
||||||
|
Yamls: []*remote.FileMeta{
|
||||||
|
&remote.FileMeta{Name: "zerostep", Data: []byte(`
|
||||||
|
skip_clone: true
|
||||||
|
pipeline:
|
||||||
|
build:
|
||||||
|
when:
|
||||||
|
branch: notdev
|
||||||
|
image: scratch
|
||||||
|
`)},
|
||||||
|
&remote.FileMeta{Name: "justastep", Data: []byte(`
|
||||||
|
pipeline:
|
||||||
|
build:
|
||||||
|
image: scratch
|
||||||
|
`)},
|
||||||
|
&remote.FileMeta{Name: "shouldbefiltered", Data: []byte(`
|
||||||
|
pipeline:
|
||||||
|
build:
|
||||||
|
image: scratch
|
||||||
|
depends_on: [ zerostep ]
|
||||||
|
`)},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
buildItems, err := b.Build()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if len(buildItems) != 1 {
|
||||||
|
t.Fatal("Zerostep and the step that depends on it should not generate a build item")
|
||||||
|
}
|
||||||
|
if "justastep" != buildItems[0].Proc.Name {
|
||||||
|
t.Fatal("justastep should have been generated")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -257,7 +304,6 @@ func TestTree(t *testing.T) {
|
||||||
pipeline:
|
pipeline:
|
||||||
build:
|
build:
|
||||||
image: scratch
|
image: scratch
|
||||||
yyy: ${DRONE_COMMIT_MESSAGE}
|
|
||||||
`)},
|
`)},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue