Update Travis to Go 1.11 and Go 1.10.4

See #5115

diff --git a/.travis.yml b/.travis.yml
index f398f2015d040d22937335f161a7d187484d03b6..395846de1d9d0947703286cb4423c7b7b54c7c36 100644 (file)
--- 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 502bd136f45dbd7997d0092d085fab7fc9906958..dd697722b32176d75737724816b8ee515f64e88a 100644 (file)
--- 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 e33816511463ba1812be68e737b1c70ae5efc795..e8a9a7b5f9c8665fbdef5ee365f27392841c64f1 100644 (file)
--- 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 dd9cd143bdb82d60b87420a8f4a8b96f0a16fb7c..b2c63057a9f61e6457b04eab9fa914ecb7c01908 100644 (file)
--- 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,
        }