From 6357dc8a9118eaee752276b2bbca95cdd285743e Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Sat, 15 Apr 2017 10:58:43 +0200
Subject: [PATCH 1/2] Update Go versions

---
 .travis.yml  | 6 +++---
 appveyor.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 570423172..80a5c7a38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/appveyor.yml b/appveyor.yml
index 435f4ef4c..34776b06c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -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

From ee7e0d05f58ff3f93f9e02b667a0e90ed2851816 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Sat, 15 Apr 2017 11:06:50 +0200
Subject: [PATCH 2/2] Remove old Go versions from run_integration_tests.go

---
 run_integration_tests.go | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/run_integration_tests.go b/run_integration_tests.go
index 53207550c..ac38b9951 100644
--- a/run_integration_tests.go
+++ b/run_integration_tests.go
@@ -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",