mirror of
https://github.com/restic/restic.git
synced 2024-12-25 09:18:55 +00:00
commit
e73038cbcb
3 changed files with 8 additions and 35 deletions
|
@ -3,7 +3,7 @@ sudo: false
|
|||
|
||||
go:
|
||||
- 1.7.5
|
||||
- 1.8
|
||||
- 1.8.1
|
||||
- tip
|
||||
|
||||
os:
|
||||
|
@ -21,10 +21,10 @@ matrix:
|
|||
- os: osx
|
||||
go: tip
|
||||
- os: linux
|
||||
go: 1.8
|
||||
go: 1.8.1
|
||||
include:
|
||||
- os: linux
|
||||
go: 1.8
|
||||
go: 1.8.1
|
||||
sudo: true
|
||||
env:
|
||||
RESTIC_TEST_FUSE=1
|
||||
|
|
|
@ -17,8 +17,8 @@ init:
|
|||
|
||||
install:
|
||||
- rmdir c:\go /s /q
|
||||
- appveyor DownloadFile https://storage.googleapis.com/golang/go1.8.windows-amd64.msi
|
||||
- msiexec /i go1.8.windows-amd64.msi /q
|
||||
- appveyor DownloadFile https://storage.googleapis.com/golang/go1.8.1.windows-amd64.msi
|
||||
- msiexec /i go1.8.1.windows-amd64.msi /q
|
||||
- go version
|
||||
- go env
|
||||
- appveyor DownloadFile http://sourceforge.netcologne.de/project/gnuwin32/tar/1.13-1/tar-1.13-1-bin.zip -FileName tar.zip
|
||||
|
|
|
@ -14,7 +14,6 @@ import (
|
|||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"runtime"
|
||||
"strings"
|
||||
)
|
||||
|
@ -200,7 +199,7 @@ func (env *TravisEnvironment) Prepare() error {
|
|||
return err
|
||||
}
|
||||
|
||||
if *runCrossCompile && !(runtime.Version() < "go1.7") {
|
||||
if *runCrossCompile {
|
||||
// only test cross compilation on linux with Travis
|
||||
if err := run("go", "get", "github.com/mitchellh/gox"); err != nil {
|
||||
return err
|
||||
|
@ -212,25 +211,13 @@ func (env *TravisEnvironment) Prepare() error {
|
|||
"darwin/386", "darwin/amd64",
|
||||
"freebsd/386", "freebsd/amd64",
|
||||
"openbsd/386", "openbsd/amd64",
|
||||
}
|
||||
if !strings.HasPrefix(runtime.Version(), "go1.3") {
|
||||
env.goxOSArch = append(env.goxOSArch,
|
||||
"linux/arm", "freebsd/arm")
|
||||
"linux/arm", "freebsd/arm",
|
||||
}
|
||||
} else {
|
||||
env.goxOSArch = []string{runtime.GOOS + "/" + runtime.GOARCH}
|
||||
}
|
||||
|
||||
msg("gox: OS/ARCH %v\n", env.goxOSArch)
|
||||
|
||||
if runtime.Version() < "go1.5" {
|
||||
err := run("gox", "-build-toolchain",
|
||||
"-osarch", strings.Join(env.goxOSArch, " "))
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
|
@ -288,20 +275,6 @@ func (env *TravisEnvironment) Teardown() error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func goVersionAtLeast151() bool {
|
||||
v := runtime.Version()
|
||||
|
||||
if match, _ := regexp.MatchString(`^go1\.[0-4]`, v); match {
|
||||
return false
|
||||
}
|
||||
|
||||
if v == "go1.5" {
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
// Background is a program running in the background.
|
||||
type Background struct {
|
||||
Cmd *exec.Cmd
|
||||
|
@ -372,7 +345,7 @@ func (env *TravisEnvironment) RunTests() error {
|
|||
|
||||
env.env["GOPATH"] = cwd + ":" + filepath.Join(cwd, "vendor")
|
||||
|
||||
if *runCrossCompile && !(runtime.Version() < "go1.7") {
|
||||
if *runCrossCompile {
|
||||
// compile for all target architectures with tags
|
||||
for _, tags := range []string{"release", "debug"} {
|
||||
err := runWithEnv(env.env, "gox", "-verbose",
|
||||
|
|
Loading…
Reference in a new issue