diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-11-15 21:29:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 21:29:22 +0800 |
| commit | ce3c52d17dc5cba53f7b0334c37fb999069c0b9e (patch) | |
| tree | d29d013fb513e0656e44fb5164ab691c680c73f8 | |
| parent | 6e4d623dc8a3f28331ddba30eb9c01a69faa46e8 (diff) | |
| parent | 6663d0264edc364ed8efbb3615e27c2a958b0dda (diff) | |
| download | dexon-ce3c52d17dc5cba53f7b0334c37fb999069c0b9e.tar dexon-ce3c52d17dc5cba53f7b0334c37fb999069c0b9e.tar.gz dexon-ce3c52d17dc5cba53f7b0334c37fb999069c0b9e.tar.bz2 dexon-ce3c52d17dc5cba53f7b0334c37fb999069c0b9e.tar.lz dexon-ce3c52d17dc5cba53f7b0334c37fb999069c0b9e.tar.xz dexon-ce3c52d17dc5cba53f7b0334c37fb999069c0b9e.tar.zst dexon-ce3c52d17dc5cba53f7b0334c37fb999069c0b9e.zip | |
Merge pull request #3268 from fjl/build-master-unstable
build: master is unstable
| -rw-r--r-- | build/ci.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/ci.go b/build/ci.go index 9d1543ea4..8ddc50a0c 100644 --- a/build/ci.go +++ b/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 |