-
Notifications
You must be signed in to change notification settings - Fork 111
Merge master to release-3.8 #46
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.
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
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bump containerd to the released v1.5.0. This requires the newest oras version. Oras has been split into separate library and CLI components, so we have to switch to using the new oras-project/oras-go module.
Bump containerd dep with required oras update
Minor aesthetic fix to user prompts
CI Config Refactor
Simplify check-go-mod Step
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.5.0 to 1.5.1. - [Release notes](https://github.com/containerd/containerd/releases) - [Changelog](https://github.com/containerd/containerd/blob/master/RELEASES.md) - [Commits](containerd/containerd@v1.5.0...v1.5.1) Signed-off-by: dependabot[bot] <support@github.com>
…ontainerd/containerd-1.5.1 build(deps): bump github.com/containerd/containerd from 1.5.0 to 1.5.1
Bumps [github.com/fatih/color](https://github.com/fatih/color) from 1.10.0 to 1.11.0. - [Release notes](https://github.com/fatih/color/releases) - [Commits](fatih/color@v1.10.0...v1.11.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Update Ubuntu CI Image to Latest
Update Linter
Bump Go to 1.15
As of Go 1.16, the equivalent syscall functions affect all OS threads, which is not compatible with the approach taken in our tests.
Bump Go to 1.16
tri-adam
approved these changes
May 18, 2021
Member
tri-adam
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of the Pull Request (PR):
Merging
mastertorelease-3.8so that 3.8.0 can benefit from the various CI improvements, and the Go 1.16 fix from @tri-adam. Also moves us to theoras-godependency so that it's easier to track oras going forward.Before submitting a PR, make sure you have done the following:
make checkand tested this PR locally with amake test, andmake testallif possible (see CONTRIBUTING.md).