Skip to content

Commit

Permalink
Merge pull request #715 from bradrydzewski/master
Browse files Browse the repository at this point in the history
fix for #713, match branches with wildcard
  • Loading branch information
bradrydzewski committed Nov 18, 2014
2 parents 0af15d5 + f15cc20 commit 789435d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
4 changes: 3 additions & 1 deletion plugin/condition/condition.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package condition

import (
"path/filepath"
"strings"
)

Expand Down Expand Up @@ -40,7 +41,8 @@ func (c *Condition) MatchBranch(branch string) bool {
if c.AllBranches != nil && *c.AllBranches == true {
return true
}
return c.Branch == branch
match, _ := filepath.Match(c.Branch, branch)
return match
}

// MatchOwner is a helper function that returns false
Expand Down
6 changes: 6 additions & 0 deletions plugin/condition/condition_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ func Test_MatchBranch(t *testing.T) {
if got != want {
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) {
Expand Down

0 comments on commit 789435d

Please sign in to comment.