2
2
mirror of https://github.com/octoleo/restic.git synced 2024-06-22 18:45:09 +00:00

Merge pull request #271 from restic/go1.5

travis: add go1.5
This commit is contained in:
Alexander Neumann 2015-08-20 20:58:33 +02:00
commit fdbff14e78
2 changed files with 7 additions and 5 deletions

View File

@ -4,13 +4,12 @@ sudo: false
go: go:
- 1.3.3 - 1.3.3
- 1.4.2 - 1.4.2
- 1.5
os: os:
- linux - linux
- osx - osx
env: GOX_OS="linux darwin openbsd freebsd windows" GOX_ARCH="386 amd64 arm"
notifications: notifications:
irc: irc:
channels: channels:

View File

@ -47,9 +47,12 @@ func (env *TravisEnvironment) Prepare() {
} }
msg("gox: OS %v, ARCH %v\n", env.goxOS, env.goxArch) msg("gox: OS %v, ARCH %v\n", env.goxOS, env.goxArch)
run("gox", "-build-toolchain",
"-os", strings.Join(env.goxOS, " "), if !strings.HasPrefix(runtime.Version(), "go1.5") {
"-arch", strings.Join(env.goxArch, " ")) run("gox", "-build-toolchain",
"-os", strings.Join(env.goxOS, " "),
"-arch", strings.Join(env.goxArch, " "))
}
} }
func (env *TravisEnvironment) RunTests() { func (env *TravisEnvironment) RunTests() {