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

create multiple BUILD files in vendor. #40777

Merged
merged 4 commits into from
Apr 14, 2017
Merged

create multiple BUILD files in vendor. #40777

merged 4 commits into from
Apr 14, 2017

Conversation

mikedanese
Copy link
Member

@mikedanese mikedanese commented Feb 1, 2017 •
edited
Loading

this should reduce the rebase misery that is vendor/BUILD.

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

This change is Reviewable

@k8s-github-robot k8s-github-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note-label-needed labels Feb 1, 2017
@mikedanese mikedanese assigned spxtr and ixdy and unassigned liggitt Feb 1, 2017
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 1, 2017
@liggitt
Copy link
Member

liggitt commented Feb 1, 2017

what is MultiBUILDVendor?

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 1, 2017
@spxtr
Copy link
Contributor

spxtr commented Feb 2, 2017

gazel change is merged, should we go with this?

@ixdy
Copy link
Member

ixdy commented Feb 2, 2017

can you make it more obvious which of the commits is autogenerated?

@spxtr spxtr mentioned this pull request Feb 2, 2017
Closed
@ixdy
Copy link
Member

ixdy commented Feb 6, 2017

@mikedanese want to tag a new gazel release and rebase this?

@mikedanese
Copy link
Member Author

I'll regenerate this today.

@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 13, 2017
@mikedanese mikedanese changed the title TEST: try using multiple BUILD files in vendor. create multiple BUILD files in vendor. Feb 13, 2017
@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 14, 2017
@spxtr spxtr mentioned this pull request Feb 17, 2017
Merged
@spxtr
Copy link
Contributor

spxtr commented Feb 21, 2017

Plan on doing this soon?

@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 5, 2017
@spxtr
Copy link
Contributor

spxtr commented Apr 5, 2017

@k8s-bot cross build this
@k8s-bot bazel test this
@k8s-bot verify test this

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 7, 2017
@ixdy
Copy link
Member

ixdy commented Apr 7, 2017

should we rebase this and try to get it in?

we probably need to find a top-level approver to make this easier.

@spxtr spxtr mentioned this pull request Apr 14, 2017
Closed
@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 14, 2017
@k8s-github-robot k8s-github-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 14, 2017
@spxtr
Copy link
Contributor

spxtr commented Apr 14, 2017

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ixdy, mikedanese, smarterclayton, spxtr

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

@smarterclayton
Copy link
Contributor

Merge, damn you

@ixdy
Copy link
Member

ixdy commented Apr 14, 2017

@k8s-bot pull-kubernetes-cross test this

@ixdy
Copy link
Member

ixdy commented Apr 14, 2017 •
edited
Loading

oh, hm, that actually looks broken:

I0414 11:07:29.245] # k8s.io/kubernetes/pkg/util/term
I0414 11:07:29.245] pkg/util/term/resizeevents_windows.go:28: undefined: Size
I0414 11:07:29.245] pkg/util/term/setsize_unsupported.go:21: undefined: Size

but not due to this PR. (#41543)

@spxtr
Copy link
Contributor

spxtr commented Apr 14, 2017

I think we should just ask build-cop to click the merge button after a rebase.

@smarterclayton
Copy link
Contributor

smarterclayton commented Apr 14, 2017 via email

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Apr 14, 2017 •
edited
Loading

@mikedanese: The following test(s) failed:

Test name Commit Details Rerun command
pull-kubernetes-cross bd23931 link @k8s-bot pull-kubernetes-cross test this

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@mikedanese
Copy link
Member Author

Flake.

@k8s-bot cvm gce e2e test this

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 40777, 43673)

@k8s-github-robot k8s-github-robot merged commit 809edf8 into kubernetes:master Apr 14, 2017
@mikedanese mikedanese deleted the check-staging branch April 14, 2017 20:34
@caesarxuchao caesarxuchao mentioned this pull request Apr 17, 2017
Merged
monopole added a commit to monopole/kubernetes that referenced this pull request Apr 18, 2017
@monopole
Patchable version of mainline PR kubernetes#44423 for 1.6 release bra…
a26452b 
…nch.

The original full PR
  kubernetes#44423
came after a large PR
  kubernetes#40777
that split /vendor/BUILD into hundreds of BUILD files.

Thus PR 44423's version of rest/BUILD does not exist
in the 1.6 release branch, and had to be tweaked here.
@monopole monopole mentioned this pull request Apr 18, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request Apr 18, 2017
Merge pull request #44622 from monopole/jr_patch_to_upstream_release-1.6
ec5b632 
Automatic merge from submit-queue

Use OS-specific libs when computing client User-Agent in kubectl, etc.

This PR fixes issue 44419 in the release branch.
This PR is a patchable version of mainline PR #44423 for 1.6 release branch

The original full PR
  #44423
came after a large PR
  #40777
that split /vendor/BUILD into hundreds of BUILD files.

Thus PR 44423's version of rest/BUILD does not exist
in the 1.6 release branch, and had to be tweaked here.

```release-note
Fix for [Windows kubectl sending full path to binary in User Agent](#44419).
```
k8s-publish-robot pushed a commit to kubernetes/client-go that referenced this pull request Apr 18, 2017
@monopole @k8s-publish-robot
Patchable version of mainline PR #44423 for 1.6 release branch.
845ec4d 
The original full PR
  kubernetes/kubernetes#44423
came after a large PR
  kubernetes/kubernetes#40777
that split /vendor/BUILD into hundreds of BUILD files.

Thus PR 44423's version of rest/BUILD does not exist
in the 1.6 release branch, and had to be tweaked here.

Kubernetes-commit: a26452b2da054b1326eb809e08b6ae8a6096e758
caesarxuchao pushed a commit to caesarxuchao/client-go that referenced this pull request Apr 19, 2017
@monopole @k8s-publish-robot
Patchable version of mainline PR #44423 for 1.6 release branch.
bc67a55 
The original full PR
  kubernetes/kubernetes#44423
came after a large PR
  kubernetes/kubernetes#40777
that split /vendor/BUILD into hundreds of BUILD files.

Thus PR 44423's version of rest/BUILD does not exist
in the 1.6 release branch, and had to be tweaked here.

Kubernetes-commit: a26452b2da054b1326eb809e08b6ae8a6096e758
@ixdy ixdy mentioned this pull request Aug 23, 2017
Closed
dims pushed a commit to dims/kubernetes that referenced this pull request Feb 8, 2018
Merge pull request kubernetes#40777 from mikedanese/check-staging
ce934ba 
Automatic merge from submit-queue (batch tested with PRs 40777, 43673)

create multiple BUILD files in vendor.

this should reduce the rebase misery that is vendor/BUILD.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ixdy ixdy ixdy left review comments

Assignees

@spxtr spxtr

@ixdy ixdy

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. 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
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@mikedanese @k8s-reviewable @liggitt @spxtr @ixdy @smarterclayton @k8s-github-robot @k8s-ci-robot