From d6fd94e49d33d4397e43d2ac836c94b0390c2f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20K=C3=B6tter?= Date: Mon, 4 Jun 2018 15:04:50 +0200 Subject: [PATCH] Don't run Solaris build for go1.9 --- .travis.yml | 2 +- run_integration_tests.go | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ea8ecac3..f503fa3e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ matrix: include: - os: linux go: "1.9.x" - env: RESTIC_TEST_FUSE=0 RESTIC_TEST_CLOUD_BACKENDS=0 + env: RESTIC_TEST_FUSE=0 RESTIC_TEST_CLOUD_BACKENDS=0 RESTIC_BUILD_SOLARIS=0 # only run fuse and cloud backends tests on Travis for the latest Go on Linux - os: linux diff --git a/run_integration_tests.go b/run_integration_tests.go index f67033436..0908680d2 100644 --- a/run_integration_tests.go +++ b/run_integration_tests.go @@ -135,7 +135,12 @@ func (env *TravisEnvironment) Prepare() error { "freebsd/386", "freebsd/amd64", "openbsd/386", "openbsd/amd64", "linux/arm", "freebsd/arm", - "solaris/amd64", + } + + if os.Getenv("RESTIC_BUILD_SOLARIS") == "0" { + msg("Skipping Solaris build\n") + } else { + env.goxOSArch = append(env.goxOSArch, "solaris/amd64") } } else { env.goxOSArch = []string{runtime.GOOS + "/" + runtime.GOARCH}