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

bindata on master wants to generate #39631

Closed
wants to merge 1 commit into from
Closed

bindata on master wants to generate #39631

wants to merge 1 commit into from

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Jan 9, 2017

I'm getting a diff produced on master from

git checkout master && git fetch upstream && git merge upstream/master && git push
make clean
hack/generate-bindata.sh

Checking to see if it tolerates being checked in.

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

This change is Reviewable

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Jan 9, 2017
@k8s-ci-robot
Copy link
Contributor

Jenkins unit/integration failed for commit 177a1e2. Full PR test history.

The magic incantation to run this job again is @k8s-bot unit test this. Please help us cut down flakes by linking to an open flake 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.

@deads2k
Copy link
Contributor Author

deads2k commented Jan 9, 2017

@k8s-bot unit test this: issues #39604

@deads2k
Copy link
Contributor Author

deads2k commented Jan 9, 2017

@fabianofranz @brendandburns mind trying against master, this is driving me bonkers

@liggitt
Copy link
Member

liggitt commented Jan 10, 2017

when I pull this branch and do make clean, I get different output... it tries to put the paths back to ../../../... and the content is output differently.

Can you add -nocompress and regen? I think gzip output changed from 1.6 to 1.7

go-bindata -nometadata -nocompress -prefix "${KUBE_ROOT}" -o "${BINDATA_OUTPUT}.tmp" -pkg generated \
	-ignore .jpg -ignore .png -ignore .md \
	"${KUBE_ROOT}/translations/..."

@liggitt
Copy link
Member

liggitt commented Jan 10, 2017

looks like the paths are different when invoked via make vs directly using hack/generate-bindata.sh

@liggitt
Copy link
Member

liggitt commented Jan 10, 2017

trying the nocompress fix in #39673

@liggitt liggitt closed this Jan 10, 2017
@liggitt liggitt mentioned this pull request Jan 10, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request Jan 11, 2017
Merge pull request #39673 from liggitt/deads2k-fix-bindata
3a7af8f 
Automatic merge from submit-queue (batch tested with PRs 39673, 39536, 39617, 39540, 39686)

Generate stable bindata output

fixes #30621

bindata generation produces spurious diffs when run with different go versions because gzip output is not stable between versions.

It also produces spurious diffs when invoked directly vs via make/go:generate.

This PR:
* adds data to bindata uncompressed (makes translation files human-readable, and the zip files were already compressed... for reference the file was 27.7 KB before, and 20.1 KB with this change)
* runs the generation from KUBE_ROOT, so it doesn't matter whether it is invoked directly or via go:generate

supercedes #39631
@deads2k deads2k deleted the fix-bindata branch February 1, 2017 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@smarterclayton smarterclayton

Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@deads2k @k8s-reviewable @k8s-ci-robot @liggitt @smarterclayton @k8s-github-robot