diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-08-25 11:26:19 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-08-25 17:37:42 +0200 |
| commit | d32ff16fd61f55874e81d73759afa099b8bdcb57 (patch) | |
| tree | 3600e842147a994ac429718058b610e00a67b166 | |
| parent | e6eda2a370aa1184e0afaf12e95dbd6f8b63ace5 (diff) | |
Update Travis to Go 1.11 and Go 1.10.4
See #5115
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Gopkg.toml | 2 | ||||
| -rw-r--r-- | magefile.go | 2 | ||||
| -rw-r--r-- | resource/transform.go | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index f398f2015..395846de1 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 502bd136f..dd697722b 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 e33816511..e8a9a7b5f 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 dd9cd143b..b2c63057a 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, } |