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.

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

Revert "Use go-ansiterm version matching docker/pkg/term/windows v1.11" #48972

Merged
merged 2 commits into from
Jul 17, 2017

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Jul 15, 2017

This reverts commit 72044a1.

What this PR does / why we need it: earlier this week, #47140 updated the vendored azure dependencies, which broke the windows build because the docker dependencies were too old. #48933 was merged, which reverted part of #47140 and fixed the build, but then #48308, which updated the vendored docker dependencies, broke the windows build again.

By reverting #48933, we should get back to a working build, I hope.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #48887

Release note:

NONE

/release-note-none
/test pull-kubernetes-cross
/assign @brendandburns
cc @karataliu @yguo0905 @yujuhong @dchen1107

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 15, 2017
@k8s-github-robot k8s-github-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note-none Denotes a PR that doesn't merit a release note. labels Jul 15, 2017
@ixdy
Copy link
Member Author

ixdy commented Jul 15, 2017

also fixed a small compilation failure missed in #48308

@yguo0905 PTAL
/assign @yguo0905

@ixdy
Copy link
Member Author

ixdy commented Jul 15, 2017

/assign @karataliu too

@k8s-ci-robot
Copy link
Contributor

@ixdy: GitHub didn't allow me to assign the following users: karataliu, too.

Note that only kubernetes members can be assigned.

In response to this:

/assign @karataliu too

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ixdy
Copy link
Member Author

ixdy commented Jul 15, 2017

/assign @karataliu
too

@k8s-ci-robot
Copy link
Contributor

@ixdy: GitHub didn't allow me to assign the following users: karataliu.

Note that only kubernetes members can be assigned.

In response to this:

/assign @karataliu
too

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ixdy
Copy link
Member Author

ixdy commented Jul 15, 2017

/test pull-kubernetes-cross

@yguo0905
Copy link
Contributor

/retest

@yujuhong
Copy link
Contributor

/lgtm

Ping @brendanburns for approval.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 17, 2017
@ixdy
Copy link
Member Author

ixdy commented Jul 17, 2017

@brendandburns can I get approval please?

@brendandburns
Copy link
Contributor

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brendandburns, ixdy, yujuhong

Associated issue: 47140

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 17, 2017
@ixdy ixdy added the kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. label Jul 17, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 48997, 48595, 48898, 48711, 48972)

@k8s-github-robot k8s-github-robot merged commit d20414e into kubernetes:master Jul 17, 2017
@ixdy ixdy deleted the revert-pr-48933 branch May 15, 2018 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

windows/amd64 cross-build is broken: vendor/github.com/docker/docker/pkg/term/windows
6 participants