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

Fix windows build by altering go-ansiterm version #48933

Merged
merged 1 commit into from
Jul 14, 2017
Merged

Fix windows build by altering go-ansiterm version #48933

merged 1 commit into from
Jul 14, 2017

Conversation

karataliu
Copy link
Contributor

What this PR does / why we need it:
An attempt to fix windows build break in #48887, moves github.com/Azure/go-ansiterm to Azure/go-ansiterm@70b2c90.
We can upgrade to new version when we pick docker 1.12

See also:
moby/moby@fab67ab#diff-c36e523b64f1ca41293e912113063a92L9

Which issue this PR fixes
Fixes #48887

Special notes for your reviewer:

Release note:

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 14, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @karataliu. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 14, 2017
@k8s-github-robot k8s-github-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note-label-needed labels Jul 14, 2017
@dims
Copy link
Member

dims commented Jul 14, 2017

/ok-to-test

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. release-note-label-needed labels Jul 14, 2017
@dims
Copy link
Member

dims commented Jul 14, 2017

/release-note-none

@dims
Copy link
Member

dims commented Jul 14, 2017

/test pull-kubernetes-cross

@dims
Copy link
Member

dims commented Jul 14, 2017

@ixdy @cblecker this PR seems to fix #48887 PTAL

@cblecker
Copy link
Member

Yeah, this looks fine to me.
/assign @brendandburns

@cblecker
Copy link
Member

/priority failing-test

@k8s-ci-robot k8s-ci-robot added the kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. label Jul 14, 2017
@ixdy
Copy link
Member

ixdy commented Jul 14, 2017

looks fine to me but I'd like @brendandburns to confirm

@brendandburns
Copy link
Contributor

/lgtm

Thanks for the fix!

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brendandburns, karataliu

Associated issue: 48887

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 14, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 47066, 48892, 48933, 48854, 48894)

@k8s-github-robot k8s-github-robot merged commit 726184c into kubernetes:master Jul 14, 2017
This was referenced Jul 15, 2017
Closed
Merged
k8s-github-robot pushed a commit that referenced this pull request Jul 17, 2017
Merge pull request #48972 from ixdy/revert-pr-48933
d20414e 
Automatic merge from submit-queue (batch tested with PRs 48997, 48595, 48898, 48711, 48972)

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

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**:

```release-note
NONE
```
/release-note-none
/test pull-kubernetes-cross
/assign @brendandburns 
cc @karataliu @yguo0905 @yujuhong @dchen1107
@jdumars jdumars mentioned this pull request Jul 19, 2017
Closed
@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@wojtek-t wojtek-t added this to the v1.7 milestone Jul 19, 2017
@wojtek-t wojtek-t added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jul 19, 2017
wojtek-t referenced this pull request Jul 19, 2017
@wojtek-t
Merge pull request #49204 from brendandburns/automated-cherry-pick-of…
e7bb571 
…-#48933-upstream-release-1.7

Use go-ansiterm version matching docker/pkg/term/windows v1.11
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.7" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@karataliu karataliu deleted the fixwinbuild branch August 2, 2017 05:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jbeda jbeda

@thockin thockin

@brendandburns brendandburns

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.

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