roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #3317 from fjl/build-unstable-simplify

Browse Source 
build, internal/build: simplify unstable build checks
This commit is contained in:
Péter Szilágyi 2016-11-23 12:24:28 +02:00 committed by GitHub
commit e05d35e6e0
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
appveyor.yml
View File

@ -22,19 +22,18 @@ environment:
install: install:
- rmdir C:\go /s /q - rmdir C:\go /s /q
- appveyor DownloadFile https://storage.googleapis.com/golang/go1.7.3.windows-amd64.zip - appveyor DownloadFile https://storage.googleapis.com/golang/go1.7.3.windows-%GETH_ARCH%.zip
- 7z x go1.7.3.windows-amd64.zip -y -oC:\ > NUL - 7z x go1.7.3.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
- go version - go version
- gcc --version - gcc --version
build_script: build_script:
- go run build\ci.go install -arch %GETH_ARCH% - go run build\ci.go install
after_build: after_build:
- go run build\ci.go archive -arch %GETH_ARCH% -type zip -signer WINDOWS_SIGNING_KEY -upload gethstore/builds - go run build\ci.go archive -type zip -signer WINDOWS_SIGNING_KEY -upload gethstore/builds
- go run build\ci.go nsis -arch %GETH_ARCH% -signer WINDOWS_SIGNING_KEY -upload gethstore/builds - go run build\ci.go nsis -signer WINDOWS_SIGNING_KEY -upload gethstore/builds
test_script: test_script:
- set GOARCH=%GETH_ARCH%
- set CGO_ENABLED=1 - set CGO_ENABLED=1
- go run build\ci.go test -vet -coverage - go run build\ci.go test -vet -coverage

2
build/ci.go
View File

@ -459,7 +459,7 @@ func makeWorkdir(wdflag string) string {
} }
func isUnstableBuild(env build.Environment) bool { func isUnstableBuild(env build.Environment) bool {
if env.Branch != "master" && env.Tag != "" { if env.Tag != "" {
return false return false
} }
return true return true

5
internal/build/env.go
View File

@ -88,8 +88,9 @@ func LocalEnv() Environment {
env.Branch = b env.Branch = b
} }
} }
// Note that we don't get the current git tag. It would slow down if env.Tag == "" {
// builds and isn't used by anything. env.Tag = RunGit("for-each-ref", "--points-at=HEAD", "--count=1", "--format=%(refname:short)", "refs/tags")
}
return env return env
} }

7
internal/build/util.go
View File

@ -76,6 +76,8 @@ func VERSION() string {
return string(bytes.TrimSpace(version)) return string(bytes.TrimSpace(version))
} }
var warnedAboutGit bool
// RunGit runs a git subcommand and returns its output. // RunGit runs a git subcommand and returns its output.
// The command must complete successfully. // The command must complete successfully.
func RunGit(args ...string) string { func RunGit(args ...string) string {
@ -83,7 +85,10 @@ func RunGit(args ...string) string {
var stdout, stderr bytes.Buffer var stdout, stderr bytes.Buffer
cmd.Stdout, cmd.Stderr = &stdout, &stderr cmd.Stdout, cmd.Stderr = &stdout, &stderr
if err := cmd.Run(); err == exec.ErrNotFound { if err := cmd.Run(); err == exec.ErrNotFound {
log.Println("no git in PATH") if !warnedAboutGit {
log.Println("Warning: can't find 'git' in PATH")
warnedAboutGit = true
}
return "" return ""
} else if err != nil { } else if err != nil {
log.Fatal(strings.Join(cmd.Args, " "), ": ", err, "\n", stderr.String()) log.Fatal(strings.Join(cmd.Args, " "), ": ", err, "\n", stderr.String())