From 9d2a55125e5bc1b2210bde1071fd1a67e33540e9 Mon Sep 17 00:00:00 2001 From: Juanjo Alvarez Date: Thu, 15 Mar 2018 14:53:11 +0100 Subject: [PATCH] Update to Go 1.9 Signed-off-by: Juanjo Alvarez --- .travis.yml | 2 +- assets/build/bindata.go | 7 ++++--- assets/skeleton/bindata.go | 9 +++++---- etc/build/etc/build/Dockerfile.build.alpine.tpl | 4 ++-- etc/skeleton/.travis.yml | 2 +- etc/skeleton/manifest.toml.tpl | 4 ++-- manifest/manifest_test.go | 4 ++-- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 88357f8c..bd674b23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.8 + - 1.9 - tip go_import_path: gopkg.in/bblfsh/sdk.v1 diff --git a/assets/build/bindata.go b/assets/build/bindata.go index 2a13535b..f4069dbb 100644 --- a/assets/build/bindata.go +++ b/assets/build/bindata.go @@ -108,7 +108,7 @@ ENV GOROOT="" ENV GOLANG_SRC_URL https://golang.org/dl/go${RUNTIME_GO_VERSION}.src.tar.gz -# from https://github.com/docker-library/golang/blob/master/1.8/alpine3.6/Dockerfile +# from https://github.com/docker-library/golang/blob/master/1.9/alpine3.7/Dockerfile RUN apk add --update --no-cache ca-certificates openssl && update-ca-certificates RUN wget https://raw.githubusercontent.com/docker-library/golang/e63ba9c5efb040b35b71e16722b71b2931f29eb8/${RUNTIME_GO_VERSION}/alpine3.6/no-pic.patch -O /no-pic.patch -O /no-pic.patch @@ -136,7 +136,8 @@ RUN set -ex \ ENV GOPATH /go ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH -RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"`) +RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH" +`) func etcBuildDockerfileBuildAlpineTplBytes() ([]byte, error) { return _etcBuildDockerfileBuildAlpineTpl, nil @@ -148,7 +149,7 @@ func etcBuildDockerfileBuildAlpineTpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "etc/build/Dockerfile.build.alpine.tpl", size: 1155, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "etc/build/Dockerfile.build.alpine.tpl", size: 1156, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/assets/skeleton/bindata.go b/assets/skeleton/bindata.go index d8438169..0a5e516f 100644 --- a/assets/skeleton/bindata.go +++ b/assets/skeleton/bindata.go @@ -78,7 +78,7 @@ func Gitignore() (*asset, error) { var _TravisYml = []byte(`language: go go: - - 1.8 + - 1.9 services: - docker @@ -1124,11 +1124,12 @@ description = """ os = "{{.OS}}" # go_version describes the version being use to build the driver Go code. -go_version = "1.8" +go_version = "1.9" # native_version describes the version or versions being use to build and # execute the native code, you should define at least one. (eg.: "1.8"). -native_version = []`) +native_version = [] +`) func manifestTomlTplBytes() ([]byte, error) { return _manifestTomlTpl, nil @@ -1140,7 +1141,7 @@ func manifestTomlTpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "manifest.toml.tpl", size: 1131, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "manifest.toml.tpl", size: 1132, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/etc/build/etc/build/Dockerfile.build.alpine.tpl b/etc/build/etc/build/Dockerfile.build.alpine.tpl index 7c6c228b..fe9c97d6 100644 --- a/etc/build/etc/build/Dockerfile.build.alpine.tpl +++ b/etc/build/etc/build/Dockerfile.build.alpine.tpl @@ -6,7 +6,7 @@ ENV GOROOT="" ENV GOLANG_SRC_URL https://golang.org/dl/go${RUNTIME_GO_VERSION}.src.tar.gz -# from https://github.com/docker-library/golang/blob/master/1.8/alpine3.6/Dockerfile +# from https://github.com/docker-library/golang/blob/master/1.9/alpine3.7/Dockerfile RUN apk add --update --no-cache ca-certificates openssl && update-ca-certificates RUN wget https://raw.githubusercontent.com/docker-library/golang/e63ba9c5efb040b35b71e16722b71b2931f29eb8/${RUNTIME_GO_VERSION}/alpine3.6/no-pic.patch -O /no-pic.patch -O /no-pic.patch @@ -34,4 +34,4 @@ RUN set -ex \ ENV GOPATH /go ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH -RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH" \ No newline at end of file +RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH" diff --git a/etc/skeleton/.travis.yml b/etc/skeleton/.travis.yml index 6be87508..58f9465e 100644 --- a/etc/skeleton/.travis.yml +++ b/etc/skeleton/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.8 + - 1.9 services: - docker diff --git a/etc/skeleton/manifest.toml.tpl b/etc/skeleton/manifest.toml.tpl index 53800927..5c832eb9 100644 --- a/etc/skeleton/manifest.toml.tpl +++ b/etc/skeleton/manifest.toml.tpl @@ -23,8 +23,8 @@ description = """ os = "{{.OS}}" # go_version describes the version being use to build the driver Go code. -go_version = "1.8" +go_version = "1.9" # native_version describes the version or versions being use to build and # execute the native code, you should define at least one. (eg.: "1.8"). -native_version = [] \ No newline at end of file +native_version = [] diff --git a/manifest/manifest_test.go b/manifest/manifest_test.go index 7aa77161..34e7442c 100644 --- a/manifest/manifest_test.go +++ b/manifest/manifest_test.go @@ -19,7 +19,7 @@ features = ["ast", "uast", "roles"] [runtime] os = "alpine" native_version = ["42"] - go_version = "1.8" + go_version = "1.9" `[1:] func TestEncode(t *testing.T) { @@ -29,7 +29,7 @@ func TestEncode(t *testing.T) { m.Features = []Feature{AST, UAST, Roles} m.Documentation.Description = "foo" m.Runtime.OS = Alpine - m.Runtime.GoVersion = "1.8" + m.Runtime.GoVersion = "1.9" m.Runtime.NativeVersion = []string{"42"} buf := bytes.NewBuffer(nil)