From 19ebf69d5c60b3f3285a69d6725832a7fb22b390 Mon Sep 17 00:00:00 2001
From: David Anderson <dave@natulte.net>
Date: Tue, 22 Jan 2019 20:39:48 -0800
Subject: [PATCH] Update CircleCI to use only go 1.11.

---
 .circleci/config.yml      | 36 ++++--------------------------------
 .circleci/config.yml.tmpl |  2 +-
 .circleci/gen-config.go   |  2 +-
 go.mod                    |  1 +
 go.sum                    |  2 ++
 5 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index eb23f66..41d99bd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,30 +2,10 @@
 
 version: 2
 jobs:
-  test-1.9:
+  test-1.11:
     working_directory: /go/src/go.universe.tf/netboot
     docker:
-      - image: circleci/golang:1.9
-    steps:
-      - checkout
-      - run: make ci-prepare
-      - run: make build
-      - run: make test
-      - run: make lint
-  test-1.10:
-    working_directory: /go/src/go.universe.tf/netboot
-    docker:
-      - image: circleci/golang:1.10
-    steps:
-      - checkout
-      - run: make ci-prepare
-      - run: make build
-      - run: make test
-      - run: make lint
-  test-1.11beta2:
-    working_directory: /go/src/go.universe.tf/netboot
-    docker:
-      - image: circleci/golang:1.11beta2
+      - image: circleci/golang:1.11
     steps:
       - checkout
       - run: make ci-prepare
@@ -47,15 +27,7 @@ workflows:
   version: 2
   test-and-deploy:
     jobs:
-      - test-1.9:
-          filters:
-            tags:
-              only: /.*/
-      - test-1.10:
-          filters:
-            tags:
-              only: /.*/
-      - test-1.11beta2:
+      - test-1.11:
           filters:
             tags:
               only: /.*/
@@ -66,4 +38,4 @@ workflows:
             tags:
               only: /.*/
           requires:
-            - test-1.10
+            - test-1.11
diff --git a/.circleci/config.yml.tmpl b/.circleci/config.yml.tmpl
index eef905e..2aadf3e 100644
--- a/.circleci/config.yml.tmpl
+++ b/.circleci/config.yml.tmpl
@@ -42,4 +42,4 @@ workflows:
             tags:
               only: /.*/
           requires:
-            - test-1.10
+            - test-1.11
diff --git a/.circleci/gen-config.go b/.circleci/gen-config.go
index d6310c1..3df82d5 100644
--- a/.circleci/gen-config.go
+++ b/.circleci/gen-config.go
@@ -10,7 +10,7 @@ import (
 func main() {
 	tmpl := template.Must(template.ParseFiles("config.yml.tmpl"))
 	v := map[string][]string{
-		"GoVersions": []string{"1.9", "1.10", "1.11beta2"},
+		"GoVersions": []string{"1.11"},
 		"Arch":       []string{"amd64", "arm", "arm64", "ppc64le", "s390x"},
 	}
 	if err := tmpl.Execute(os.Stdout, v); err != nil {
diff --git a/go.mod b/go.mod
index fd807c6..ffacb74 100644
--- a/go.mod
+++ b/go.mod
@@ -4,6 +4,7 @@ require (
 	github.com/BurntSushi/toml v0.3.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsnotify/fsnotify v1.4.7 // indirect
+	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
 	github.com/google/go-cmp v0.1.0
 	github.com/hashicorp/hcl v0.0.0-20171017181929-23c074d0eceb // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
diff --git a/go.sum b/go.sum
index 38a47c2..c45f298 100644
--- a/go.sum
+++ b/go.sum
@@ -5,6 +5,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/google/go-cmp v0.1.0 h1:9tmYDKxX2N1am4Ooz6a2HC7DfK0CWNuhT8T/Fi/bvtA=
 github.com/google/go-cmp v0.1.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/hashicorp/hcl v0.0.0-20171017181929-23c074d0eceb h1:1OvvPvZkn/yCQ3xBcM8y4020wdkMXPHLB4+NfoGWh4U=