From ef7b0016264646b889b0d68d7f70d4fb2c5eb035 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Wed, 4 Sep 2019 10:19:27 +0100
Subject: [PATCH] build: update to use go1.13 for the build

---
 .travis.yml         | 14 +++++++-------
 azure-pipelines.yml | 13 ++++++-------
 go.mod              |  2 ++
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9cbaf8dcb..83b070fbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,9 +50,6 @@ matrix:
   allow_failures:
     - go: tip
   include:
-    - go: 1.9.x
-      script:
-        - make quicktest
     - go: 1.10.x
       script:
         - make quicktest
@@ -60,6 +57,9 @@ matrix:
       script:
         - make quicktest
     - go: 1.12.x
+      script:
+        - make quicktest
+    - go: 1.13.x
       name: Linux
       env:
         - GOTAGS=cmount
@@ -69,7 +69,7 @@ matrix:
         - make build_dep
         - make check
         - make quicktest
-    - go: 1.12.x
+    - go: 1.13.x
       name: Go Modules / Race
       env:
         - GO111MODULE=on
@@ -77,7 +77,7 @@ matrix:
       script:
         - make quicktest
         - make racequicktest
-    - go: 1.12.x
+    - go: 1.13.x
       name: Other OS
       env:
         - DEPLOY=true
@@ -85,7 +85,7 @@ matrix:
       script:
         - make
         - make compile_all
-    - go: 1.12.x
+    - go: 1.13.x
       name: macOS
       os: osx
       env:
@@ -101,7 +101,7 @@ matrix:
         - make racequicktest
     # - os: windows
     #   name: Windows
-    #   go: 1.12.x
+    #   go: 1.13.x
     #   env:
     #     - GOTAGS=cmount
     #     - CPATH='C:\Program Files (x86)\WinFsp\inc\fuse'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 42a0cd138..9dff63fdc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -73,12 +73,6 @@ strategy:
       GOPROXY: https://proxy.golang.org
       MAKE_QUICKTEST: true
       MAKE_RACEQUICKTEST: true
-    go1.9:
-      imageName: ubuntu-16.04
-      gorootDir: /usr/local
-      GOCACHE: ''               # build caching only came in go1.10
-      GO_VERSION: go1.9.7
-      MAKE_QUICKTEST: true
     go1.10:
       imageName: ubuntu-16.04
       gorootDir: /usr/local
@@ -87,7 +81,12 @@ strategy:
     go1.11:
       imageName: ubuntu-16.04
       gorootDir: /usr/local
-      GO_VERSION: go1.11.12
+      GO_VERSION: go1.11.13
+      MAKE_QUICKTEST: true
+    go1.12:
+      imageName: ubuntu-16.04
+      gorootDir: /usr/local
+      GO_VERSION: go1.12.9
       MAKE_QUICKTEST: true
 
 pool:
diff --git a/go.mod b/go.mod
index a04d1b1db..95b279063 100644
--- a/go.mod
+++ b/go.mod
@@ -67,3 +67,5 @@ require (
 	google.golang.org/grpc v1.23.0 // indirect
 	gopkg.in/yaml.v2 v2.2.2
 )
+
+go 1.13