Skip to content

[release/1.4] update Go to 1.15.11#5389

Merged
estesp merged 2 commits intocontainerd:release/1.4from
thaJeztah:1.4_update_golang
Apr 19, 2021
Merged

[release/1.4] update Go to 1.15.11#5389
estesp merged 2 commits intocontainerd:release/1.4from
thaJeztah:1.4_update_golang

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

This patch is specific for the 1.4 release-branch, which is not on Go1.16, and
brings the branch to the latest patch release of Go 1.15

full diff: golang/go@go1.15.8...go1.15.11

go1.15.9 (released 2021/03/10) includes security fixes to the encoding/xml
package. See the Go 1.15.9 milestone on our issue tracker for details.
https://github.com/golang/go/issues?q=milestone%3AGo1.15.9+label%3ACherryPickApproved

go1.15.10 (released 2021/03/11) includes fixes to the compiler, the go command,
and the net/http, os, syscall, and time packages. See the Go 1.15.10 milestone
on our issue tracker for details.
https://github.com/golang/go/issues?q=milestone%3AGo1.15.10+label%3ACherryPickApproved

go1.15.11 (released 2021/04/01) includes fixes to cgo, the compiler, linker,
runtime, the go command, and the database/sql and net/http packages. See the Go
1.15.11 milestone on our issue tracker for details.
https://github.com/golang/go/issues?q=milestone%3AGo1.15.11+label%3ACherryPickApproved

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 19, 2021

Build succeeded.

@thaJeztah
Copy link
Copy Markdown
Member Author

Hmmm.. is this because the base image changed, so we need to install the other btrfs-dev?

# github.com/containerd/containerd/vendor/github.com/containerd/btrfs
Error: vendor/github.com/containerd/btrfs/btrfs.go:21:10: fatal error: btrfs/ioctl.h: No such file or directory
   21 | #include <btrfs/ioctl.h>
      |          ^~~~~~~~~~~~~~~
compilation terminated.
Error: make: *** [Makefile:193: bin/containerd] Error 2
Error: Process completed with exit code 2.

pacoxu and others added 2 commits April 19, 2021 14:15
Signed-off-by: pacoxu <[email protected]>
(cherry picked from commit 01765d0)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
This patch is specific for the 1.4 release-branch, which is not on Go1.16, and
brings the branch to the latest patch release of Go 1.15

full diff: golang/go@go1.15.8...go1.15.11

go1.15.9 (released 2021/03/10) includes security fixes to the encoding/xml
package. See the Go 1.15.9 milestone on our issue tracker for details.
https://github.com/golang/go/issues?q=milestone%3AGo1.15.9+label%3ACherryPickApproved

go1.15.10 (released 2021/03/11) includes fixes to the compiler, the go command,
and the net/http, os, syscall, and time packages. See the Go 1.15.10 milestone
on our issue tracker for details.
https://github.com/golang/go/issues?q=milestone%3AGo1.15.10+label%3ACherryPickApproved

go1.15.11 (released 2021/04/01) includes fixes to cgo, the compiler, linker,
runtime, the go command, and the database/sql and net/http packages. See the Go
1.15.11 milestone on our issue tracker for details.
https://github.com/golang/go/issues?q=milestone%3AGo1.15.11+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

cherry-picked #5244

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 19, 2021

Build succeeded.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@estesp estesp merged commit c4008af into containerd:release/1.4 Apr 19, 2021
@thaJeztah thaJeztah deleted the 1.4_update_golang branch April 19, 2021 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants