Merge pull request harness#715 from bradrydzewski/master

fix for harness#713, match branches with wildcard
PatrickJS · Nov 18, 2014 · 789435d · 789435d
2 parents 0af15d5 + f15cc20
commit 789435d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/plugin/condition/condition.go b/plugin/condition/condition.go
@@ -1,6 +1,7 @@
 package condition
 
 import (
+	"path/filepath"
 	"strings"
 )
 
@@ -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

diff --git a/plugin/condition/condition_test.go b/plugin/condition/condition_test.go
@@ -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) {