cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
build: master is unstable
This commit is contained in:
Jeffrey Wilcke 2016-11-15 14:29:22 +01:00 committed by GitHub
commit ce3c52d17d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/ci.go
View File

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