From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Sat, 25 Aug 2018 09:26:19 +0000 (+0200)
Subject: Update Travis to Go 1.11 and Go 1.10.4
X-Git-Tag: v0.48~15
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d32ff16fd61f55874e81d73759afa099b8bdcb57;p=brevno-suite%2Fhugo

Update Travis to Go 1.11 and Go 1.10.4

See #5115
---

diff --git a/.travis.yml b/.travis.yml
index f398f201..395846de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ env:
 git:
   depth: false
 go:
-  - 1.9.7
-  - "1.10.3"
+  - "1.10.4"
+  - 1.11
   - tip
 os:
   - linux
diff --git a/Gopkg.toml b/Gopkg.toml
index 502bd136..dd697722 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -34,7 +34,7 @@
 
 [[constraint]]
   name = "github.com/magefile/mage"
-  version = "v1"
+  version = "^v2.2.0"
 
 [[constraint]]
   branch = "master"
diff --git a/magefile.go b/magefile.go
index e3381651..e8a9a7b5 100644
--- a/magefile.go
+++ b/magefile.go
@@ -265,7 +265,7 @@ func CheckVendor() error {
 }
 
 func isGoLatest() bool {
-	return strings.Contains(runtime.Version(), "1.10")
+	return strings.Contains(runtime.Version(), "1.11")
 }
 
 func buildTags() string {
diff --git a/resource/transform.go b/resource/transform.go
index dd9cd143..b2c63057 100644
--- a/resource/transform.go
+++ b/resource/transform.go
@@ -43,7 +43,7 @@ func (s *Spec) Transform(r Resource, t ResourceTransformation) (Resource, error)
 		Resource:                    r,
 		transformation:              t,
 		transformedResourceMetadata: transformedResourceMetadata{MetaData: make(map[string]interface{})},
-		cache: s.ResourceCache}, nil
+		cache:                       s.ResourceCache}, nil
 }
 
 type ResourceTransformationCtx struct {
@@ -337,7 +337,7 @@ func (r *transformedResource) transform(setContent bool) (err error) {
 	defer bp.PutBuffer(b2)
 
 	tctx := &ResourceTransformationCtx{
-		Data: r.transformedResourceMetadata.MetaData,
+		Data:                  r.transformedResourceMetadata.MetaData,
 		OpenResourcePublisher: openPublishFileForWriting,
 	}