Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump golang to 1.11.0 #37358

Merged
merged 7 commits into from Sep 7, 2018
Merged

Bump golang to 1.11.0 #37358

merged 7 commits into from Sep 7, 2018
+2,797 −3,686

Commits on Sep 6, 2018

  1. Format code with gofmt -s from go-1.11beta1 

    This should eliminate a bunch of new (go-1.11 related) validation
errors telling that the code is not formatted with `gofmt -s`.

No functional change, just whitespace (i.e.
`git show --ignore-space-change` shows nothing).

Patch generated with:

> git ls-files | grep -v ^vendor/ | grep .go$ | xargs gofmt -s -w

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    @kolyshkin
    kolyshkin committed Sep 6, 2018
    Configuration menu
    Copy the full SHA
    9b0097a View commit details
    Browse the repository at this point in the history

  2. Revendor ugorji/go 

    To include the following backported fix:

kolyshkin/ugorji-go@1cf431c13dec46596

which should fix this:

> 13:40:53 vendor/github.com/ugorji/go/codec/gen-helper.generated.go:1:
> possible malformed +build comment%!(EXTRA []interface {}=[])

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    @kolyshkin
    kolyshkin committed Sep 6, 2018
    Configuration menu
    Copy the full SHA
    09921ca View commit details
    Browse the repository at this point in the history

  3. vendor: bump containerd/continuity 

    This is to include the Go 1.11 fix
(containerd/continuity#120).
Again (see c64a244).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    @kolyshkin
    kolyshkin committed Sep 6, 2018
    Configuration menu
    Copy the full SHA
    bac6720 View commit details
    Browse the repository at this point in the history

  4. Dockerfile.simple: simplify by using golang img 

    Instead of installing golang from sources, it's easier to use
golang image which is based on Debian Stretch.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    @kolyshkin
    kolyshkin committed Sep 6, 2018
    Configuration menu
    Copy the full SHA
    32a2331 View commit details
    Browse the repository at this point in the history

  5. hack/make.ps1: remove the .0 suffix from go version 

    We would like to use a version with .0 suffix (like 1.11.0) in
Dockerfile, so that once a .1 version is out (like 1.11.1) we
won't accidentally switch to it.

Unfortunately it's not possible to use .0 suffix currently
as it breaks the check in make.ps1. This patch fixes that.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    @kolyshkin
    kolyshkin committed Sep 6, 2018
    Configuration menu
    Copy the full SHA
    8ad648b View commit details
    Browse the repository at this point in the history

  6. Bump golang to 1.11.0 

    It's that time of year again! Go 1.11 is released, time to use it.

This commit also

* removes our archive/tar fork, since upstream archive/tar
  is fixed for static builds, and osusergo build tag is set.

* removes ENV GO_VERSION from Dockerfile as it's not needed
  anymore since PR moby#37592 is merged.

[v2: switch to beta2]
[v3: switch to beta3]
[v4: rc1]
[v5: remove ENV GO_VERSION as PR moby#37592 is now merged]
[v6: rc2]
[v7: final!]
[v8: use 1.11.0]
[v9: back to 1.11]
[v8: use 1.11.0]

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    @kolyshkin
    kolyshkin committed Sep 6, 2018
    Configuration menu
    Copy the full SHA
    10fd051 View commit details
    Browse the repository at this point in the history

  7. Bump vndr 

    We can do that now as we're no longer carrying archive/tar.
Note that latest vndr removes vendor/ subdir so we don't have to,
thus the change in hack/validate/vendor.

While at it, re-run a new vndr version to make sure everything
that should be there is.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    @kolyshkin
    kolyshkin committed Sep 6, 2018
    Configuration menu
    Copy the full SHA
    ce858fe View commit details
    Browse the repository at this point in the history