darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

hook honors branch filter

Browse source
This commit is contained in:
Brad Rydzewski 2015-04-30 10:39:16 -07:00
parent 543a46a755
commit 371a64ef6a
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/config.go
View file

@ -78,6 +78,9 @@ func (c *Condition) MatchBranch(branch string) bool {
if len(c.Branch) == 0 {
return true
}
if strings.HasPrefix(branch, "refs/heads/") {
branch = branch[11:]
}
match, _ := filepath.Match(c.Branch, branch)
return match
}

8
parser/parse.go
View file

@ -92,3 +92,11 @@ func ParseSingle(raw string, opts *Opts) (*common.Config, error) {
}
return conf, err
}
func ParseCondition(raw string) (*common.Condition, error) {
c := struct {
Condition *common.Condition `yaml:"when"`
}{}
err := yaml.Unmarshal([]byte(raw), c)
return c.Condition, err
}

12
server/hooks.go
View file

@ -5,6 +5,7 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/drone/drone/common"
"github.com/drone/drone/parser"
"github.com/drone/drone/parser/inject"
"github.com/drone/drone/parser/matrix"
"github.com/drone/drone/queue"
@ -122,11 +123,12 @@ func PostHook(c *gin.Context) {
}
// verify the branches can be built vs skipped
// s, _ := script.ParseBuild(string(yml))
// if len(hook.PullRequest) == 0 && !s.MatchBranch(hook.Branch) {
// w.WriteHeader(http.StatusOK)
// return
// }
when, _ := parser.ParseCondition(string(raw))
if build.Commit != nil && when != nil && !when.MatchBranch(build.Commit.Ref) {
log.Infof("ignoring hook. yaml file excludes repo and branch %s %s", repo.FullName, build.Commit.Ref)
c.AbortWithStatus(200)
return
}
err = store.SetBuild(repo.FullName, build)
if err != nil {