Merge pull request #2852 from MichaelEischer/drop-go-1.11

Drop support for Go version 1.11

.travis.yml

@@ -3,14 +3,6 @@ sudo: false
 
 matrix:
   include:
-    - os: linux
-      go: "1.11.x"
-      env: RESTIC_TEST_FUSE=0 RESTIC_TEST_CLOUD_BACKENDS=0
-      cache:
-        directories:
-          - $HOME/.cache/go-build
-          - $HOME/gopath/pkg/mod
-
     - os: linux
       go: "1.12.x"
       env: RESTIC_TEST_FUSE=0 RESTIC_TEST_CLOUD_BACKENDS=0

CONTRIBUTING.md

@@ -60,16 +60,11 @@ uploading it somewhere or post only the parts that are really relevant.
 Development Environment
 =======================
 
-The repository contains several sets of directories with code: `cmd/` and
+The repository contains the code written for restic in the directories
-`internal/` contain the code written for restic, whereas `vendor/` contains
+`cmd/` and `internal/`.
-copies of libraries restic depends on. The libraries are managed with the
-command `go mod vendor`.
 
-Go >= 1.11
+Restic requires Go version 1.12 or later for compiling. Clone the repo (without
-----------
+having `$GOPATH` set) and `cd` into the directory:
-
-For Go version 1.11 or later, you should clone the repo (without having
-`$GOPATH` set) and `cd` into the directory:
 
     $ unset GOPATH
     $ git clone https://github.com/restic/restic
@@ -79,40 +74,12 @@ Then use the `go` tool to build restic:
 
     $ go build ./cmd/restic
     $ ./restic version
-    restic 0.9.2-dev (compiled manually) compiled with go1.11 on linux/amd64
+    restic 0.9.6-dev (compiled manually) compiled with go1.14 on linux/amd64
 
 You can run all tests with the following command:
 
     $ go test ./...
 
-Go < 1.11
----------
-
-In order to compile restic with Go before 1.11, it needs to be checked out at
-the right path within a `GOPATH`. The concept of a `GOPATH` is explained in
-["How to write Go code"](https://golang.org/doc/code.html).
-
-If you do not have a directory with Go code yet, executing the following
-instructions in your shell will create one for you and check out the restic
-repo:
-
-    $ export GOPATH="$HOME/go"
-    $ mkdir -p "$GOPATH/src/github.com/restic"
-    $ cd "$GOPATH/src/github.com/restic"
-    $ git clone https://github.com/restic/restic
-    $ cd restic
-
-You can then build restic as follows:
-
-    $ go build ./cmd/restic
-    $ ./restic version
-    restic compiled manually
-    compiled with go1.8.3 on linux/amd64
-
-The following commands can be used to run all the tests:
-
-    $ go test ./...
-
 Providing Patches
 =================
 

build.go

@@ -3,7 +3,7 @@
 // This program aims to make building Go programs for end users easier by just
 // calling it with `go run`, without having to setup a GOPATH.
 //
-// This program needs Go >= 1.11. It'll use Go modules for compilation. It
+// This program needs Go >= 1.12. It'll use Go modules for compilation. It
 // builds the package configured as Main in the Config struct.
 
 // BSD 2-Clause License
@@ -327,8 +327,8 @@ func (v GoVersion) String() string {
 }
 
 func main() {
-	if !goVersion.AtLeast(GoVersion{1, 11, 0}) {
+	if !goVersion.AtLeast(GoVersion{1, 12, 0}) {
-		die("Go version (%v) is too old, Go <= 1.11 does not support Go Modules\n", goVersion)
+		die("Go version (%v) is too old, restic requires Go >= 1.12\n", goVersion)
 	}
 
 	if !goVersion.AtLeast(config.MinVersion) {

changelog/unreleased/pull-2600

@@ -1,6 +1,7 @@
-Change: Require Go >= 1.11
+Change: Require Go >= 1.12
 
-Restic now requires Go to be at least 1.11. This allows simplifications in the
+Restic now requires Go to be at least 1.12. This allows simplifications in the
 build process and removing workarounds.
 
 https://github.com/restic/restic/pull/2600
+https://github.com/restic/restic/pull/2852

doc/020_installation.rst

@@ -245,7 +245,7 @@ From Source
 ***********
 
 restic is written in the Go programming language and you need at least
-Go version 1.11. Building restic may also work with older versions of Go,
+Go version 1.12. Building restic may also work with older versions of Go,
 but that's not supported. See the `Getting
 started <https://golang.org/doc/install>`__ guide of the Go project for
 instructions how to install Go.

internal/restic/node_freebsd.go

@@ -1,4 +1,4 @@
-// +build freebsd,go1.12
+// +build freebsd
 
 package restic
 

internal/restic/node_freebsd_go111.go

@@ -1,17 +0,0 @@
-// +build freebsd,!go1.12
-
-package restic
-
-import "syscall"
-
-func (node Node) restoreSymlinkTimestamps(path string, utimes [2]syscall.Timespec) error {
-	return nil
-}
-
-func (node Node) device() int {
-	return int(node.Device)
-}
-
-func (s statUnix) atim() syscall.Timespec { return s.Atimespec }
-func (s statUnix) mtim() syscall.Timespec { return s.Mtimespec }
-func (s statUnix) ctim() syscall.Timespec { return s.Ctimespec }

run_integration_tests.go

@@ -362,7 +362,7 @@ func (env *TravisEnvironment) RunTests() error {
 			return err
 		}
 	} else {
-		msg("Skipping gofmt and module vendor check for %v\n", v)
+		msg("Skipping gofmt and mod tidy check for %v\n", v)
 	}
 
 	if err = runGlyphcheck(); err != nil {