Skip to content

upgrade: bump to Go 1.12.6 #2909

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

Merged
fuweid merged 1 commit into from
Jun 17, 2019
Merged

upgrade: bump to Go 1.12.6 #2909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: required

language: go
go:
- 1.10.4
- 1.12.6

go_import_path: github.com/alibaba/pouch

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN apt-get update \
&& apt-get clean

# set go version this image use
ENV GO_VERSION=1.10.4
ENV GO_VERSION=1.12.6
ENV ARCH=amd64

# install golang which version is GO_VERSION
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Vagrant.configure("2") do |config|
if ENV["POUCH_BUILD"] == "true"
pouch.vm.provision "shell", inline: <<-SHELL
# configring environments for pouch
GO_VERSION=1.10.4
GO_VERSION=1.12.6
GOROOT=/opt/go
GOPATH=/root/go
apt-get install -y --no-install-recommends build-essential
Expand Down
2 changes: 1 addition & 1 deletion ctrd/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func withExitShimV1CheckpointTaskOpts() containerd.CheckpointTaskOpts {
func (c *Client) isInsecureDomain(ref string) bool {
u, err := url.Parse("dummy://" + ref)
if err != nil {
logrus.Warning("failed to parse reference(%s) into url: %v", ref, err)
logrus.Warningf("failed to parse reference(%s) into url: %v", ref, err)
return false
}

Expand Down
2 changes: 1 addition & 1 deletion test/z_cli_daemon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ func (suite *PouchDaemonSuite) TestDaemonTlsVerify(c *check.C) {
// Do not use TLS should fail
result = RunWithSpecifiedDaemon(&dcfg, "version")
c.Assert(result.ExitCode, check.Equals, 1)
err := util.PartialEqual(result.Stderr(), "malformed HTTP response")
err := util.PartialEqual(result.Stderr(), "Client sent an HTTP request to an HTTPS server")
c.Assert(err, check.IsNil)

{
Expand Down