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

Use LC_ALL=C with sort (again) in update-godep-licenses.sh #22892

Merged
merged 2 commits into from
Mar 12, 2016

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Mar 12, 2016

This is similar to #22812, but makes the other sort call (which sorts the list of local files to consider) stable across locale environments. This is the root cause of #22843 which was causing hack/verify-godep-licenses.sh to fail on Jenkins.

This PR also re-enables the godep-licenses check on Jenkins.

Fixes #22843

cc @david-mcmahon @karlkfi @eparis

@david-mcmahon
Copy link
Contributor

LGTM

@ixdy
Copy link
Member Author

ixdy commented Mar 12, 2016

The LICENSES diff is a bit unwieldy: https://gist.github.com/ixdy/8b1dc614c0f73d165f12

@david-mcmahon
Copy link
Contributor

LICENSES is a single file sourcing updates from 228+ packages from the interwebs. They can and do change. Expect much churn in that file as we keep it up to date and the lawyer cats happy!

@k8s-github-robot
Copy link

Labelling this PR as size/XS

@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 12, 2016
@k8s-bot
Copy link

k8s-bot commented Mar 12, 2016

GCE e2e build/test passed for commit 51f70b6.

@eparis eparis added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 12, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Mar 12, 2016

GCE e2e build/test passed for commit 51f70b6.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Mar 12, 2016

GCE e2e build/test passed for commit 51f70b6.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Mar 12, 2016

GCE e2e build/test passed for commit 51f70b6.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Mar 12, 2016
Auto commit by PR queue bot
@k8s-github-robot k8s-github-robot merged commit 7470405 into kubernetes:master Mar 12, 2016
@karlkfi
Copy link
Contributor

karlkfi commented Mar 14, 2016

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/test-infra lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants