Merge pull request #3268 from fjl/build-master-unstable

build: master is unstable
release/1.5
Jeffrey Wilcke 8 years ago committed by GitHub
commit ce3c52d17d
  1. 4
      build/ci.go

@ -395,7 +395,7 @@ func maybeSkipArchive(env build.Environment) {
log.Printf("skipping because this is a PR build")
os.Exit(0)
}
if env.Branch != "develop" && !strings.HasPrefix(env.Tag, "v1.") {
if env.Branch != "master" && !strings.HasPrefix(env.Tag, "v1.") {
log.Printf("skipping because branch %q, tag %q is not on the whitelist", env.Branch, env.Tag)
os.Exit(0)
}
@ -459,7 +459,7 @@ func makeWorkdir(wdflag string) string {
}
func isUnstableBuild(env build.Environment) bool {
if env.Branch != "develop" && env.Tag != "" {
if env.Branch != "master" && env.Tag != "" {
return false
}
return true

Loading…
Cancel
Save