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

Regenerate docs (if necessary) during cherry-pick operations. #46993

Merged
merged 1 commit into from Jun 22, 2017
Merged

Regenerate docs (if necessary) during cherry-pick operations. #46993

merged 1 commit into from Jun 22, 2017

Conversation

david-mcmahon
Copy link
Contributor

@david-mcmahon david-mcmahon commented Jun 5, 2017 •
edited

This change ensures that cherrypicks are coupled with any related doc generation required.
closes #44533

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 5, 2017
@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Jun 5, 2017
@david-mcmahon david-mcmahon added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Jun 5, 2017
@fejta
Copy link
Contributor

fejta commented Jun 5, 2017

LGTM
/unassign
/assign @pwittrock

@k8s-ci-robot k8s-ci-robot assigned pwittrock and unassigned fejta Jun 5, 2017
@fejta fejta added this to the v1.7 milestone Jun 5, 2017
@david-mcmahon
Copy link
Contributor Author

/retest

@david-mcmahon
Copy link
Contributor Author

@k8s-bot pull-kubernetes-e2e-gce-etcd3 test this

1 similar comment
@david-mcmahon
Copy link
Contributor Author

@k8s-bot pull-kubernetes-e2e-gce-etcd3 test this

@david-mcmahon
Copy link
Contributor Author

@kubernetes/test-infra-maintainers what am I missing here? The logs seem to indicate a flake. I can't imagine what from this change is causing any test failures.

@krzyzacy
Copy link
Member

krzyzacy commented Jun 8, 2017

maybe #47135

@marun marun added the sig/release Categorizes an issue or PR as relevant to SIG Release. label Jun 8, 2017
@marun
Copy link
Contributor

marun commented Jun 8, 2017

@pwittrock Does this belong in the v1.7 milestone?

@pwittrock
Copy link
Member

Looks good, but I don't know much about generate docs state, or if we even still need it.

@pwittrock
Copy link
Member

/assign @steveperry-53

@pwittrock
Copy link
Member

/unassign

@spiffxp
Copy link
Member

spiffxp commented Jun 16, 2017

/retest

1 similar comment
@marun
Copy link
Contributor

marun commented Jun 20, 2017

/retest

@marun marun requested a review from pwittrock June 21, 2017 18:32
@pwittrock
Copy link
Member

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: david-mcmahon, pwittrock

Associated issue: 44533

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

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 98c868d into kubernetes:master Jun 22, 2017
liggitt
liggitt reviewed Jun 26, 2017
View reviewed changes
hack/cherry_pick_pull.sh
if ! hack/generate-docs.sh; then
echo
echo "hack/generate-docs.sh FAILED to complete."
exit 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this makes the cherry-pick script unnecessarily slow (for most changes which do not require docs updates) and fragile (on failure, it does not enter a retry loop like the conflict case above). I'd rather see this be opt-in.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this also breaks cherry-picks to 1.6 and leaves them with lots of uncommitted generated docs in the working dir

@liggitt liggitt mentioned this pull request Jun 26, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request Jul 18, 2017
Merge pull request #48102 from liggitt/optional-doc-generation
0d88afa 
Automatic merge from submit-queue (batch tested with PRs 49043, 49001, 49057, 49066, 48102)

Make doc generation on cherry-picks optional

Follow up of #46993, xref #44533

Most cherry-picks don't require doc changes, and doing it unconditionally actually breaks picking to the release-1.6 branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liggitt liggitt liggitt left review comments

@pwittrock pwittrock Awaiting requested review from pwittrock

Assignees

@pwittrock pwittrock

@ixdy ixdy

@steveperry-53 steveperry-53

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. sig/release Categorizes an issue or PR as relevant to SIG Release. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.

manpage artifacts are not being generated in a release