mirror
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum
2
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source 
build: master is unstable
pull/3283/merge
Jeffrey Wilcke 8 years ago committed by GitHub
parent 6e4d623dc8 6663d0264e
commit ce3c52d17d
1 changed files with 2 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      build/ci.go

4
build/ci.go
Unescape 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

Write Preview
Loading…
Cancel
Save