mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-30 13:51:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #715 from bradrydzewski/master

Browse source 
fix for #713, match branches with wildcard
This commit is contained in:
Brad Rydzewski 2014-11-18 15:12:57 -08:00
commit 789435d06d
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugin/condition/condition.go
View file

@ -1,6 +1,7 @@
package condition package condition
import ( import (
"path/filepath"
"strings" "strings"
) )
@ -40,7 +41,8 @@ func (c *Condition) MatchBranch(branch string) bool {
if c.AllBranches != nil && *c.AllBranches == true { if c.AllBranches != nil && *c.AllBranches == true {
return true return true
} }
return c.Branch == branch match, _ := filepath.Match(c.Branch, branch)
return match
} }
// MatchOwner is a helper function that returns false // MatchOwner is a helper function that returns false

6
plugin/condition/condition_test.go
View file

@ -59,6 +59,12 @@ func Test_MatchBranch(t *testing.T) {
if got != want { if got != want {
t.Errorf("Branch should not match, expected %v, got %v", want, got) t.Errorf("Branch should not match, expected %v, got %v", want, got)
} }
c.Branch = "release/*"
got, want = c.MatchBranch("release/1.0.0"), true
if got != want {
t.Errorf("Branch should match wildcard, expected %v, got %v", want, got)
}
} }
func Test_MatchOwner(t *testing.T) { func Test_MatchOwner(t *testing.T) {