mirror of
https://github.com/thegeeklab/drone-yaml.git
synced 2024-11-21 17:40:39 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
1e839e8933
@ -26,6 +26,7 @@ type SkipData struct {
|
||||
Ref string
|
||||
Repo string
|
||||
Target string
|
||||
Action string
|
||||
}
|
||||
|
||||
// SkipFunc returns a function that can be used to skip
|
||||
@ -47,6 +48,8 @@ func SkipFunc(data SkipData) func(*yaml.Container) bool {
|
||||
return true
|
||||
case !container.When.Target.Match(data.Target):
|
||||
return true
|
||||
case !container.When.Action.Match(data.Action):
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
|
@ -111,6 +111,19 @@ func TestSkipFunc(t *testing.T) {
|
||||
when: yaml.Conditions{Target: yaml.Condition{Exclude: []string{"prod"}}},
|
||||
want: true,
|
||||
},
|
||||
//
|
||||
// test action conditions
|
||||
//
|
||||
{
|
||||
data: SkipData{Action: "opened"},
|
||||
when: yaml.Conditions{Action: yaml.Condition{Include: []string{"opened"}}},
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
data: SkipData{Action: "opened"},
|
||||
when: yaml.Conditions{Action: yaml.Condition{Exclude: []string{"opened"}}},
|
||||
want: true,
|
||||
},
|
||||
}
|
||||
for i, test := range tests {
|
||||
container := &yaml.Container{When: test.when}
|
||||
|
Loading…
Reference in New Issue
Block a user