Clear extraneous CHANGELOG files on a new branch. #519
Conversation
k8s-ci-robot
added
do-not-merge/work-in-progress
anago
Outdated
| # CHANGELOG_FILE to the branch | ||
| clear_sync_changelogs () { | ||
| logecho -n "Checkout $RELEASE_BRANCH branch to make changes: " | ||
| logrun -s git checkout $RELEASE_BRANCH || return 1 |
There was a problem hiding this comment.
I'm a little worried that this branch switch is inside a function. You can't tell at the call site that this function will change the meaning of future git commands.
Can we either make the caller responsible for checking out the release branch, or save/restore the previous branch in the function?
david-mcmahon
force-pushed
the
clear-changelogs-branch
branch
from
77e80a9
to
bbe92c2
Compare
k8s-ci-robot
added
size/S
david-mcmahon
changed the title
k8s-ci-robot
removed
the
do-not-merge/work-in-progress
|
PTAL @enisoc. Thanks for the review! |
anago
Outdated
| # describe'd as something other than the current tag on master | ||
| # If/when the generate-docs.sh issue is sorted out, this will become | ||
| # optional, though probably still useful anyway. | ||
| if [[ "$branch" =~ release- ]]; then |
There was a problem hiding this comment.
It looks like the $PARENT_BRANCH check above was causing docs to be generated only at the initial branch point (beta.0), not for subsequent releases. Is that right? If so, is there a reason we wouldn't need that check here too?
There was a problem hiding this comment.
And this is why I keep sending you PRs. :) Yes, that is better to keep that logic here as well.
david-mcmahon
force-pushed
the
clear-changelogs-branch
branch
from
bbe92c2
to
8e84644
Compare
| # optional, though probably still useful anyway. | ||
| if [[ "$PARENT_BRANCH" == "master" && "$branch" != "master" ]]; then | ||
| logecho -n "Remove any previous CHANGELOG-*.md files: " | ||
| logrun -s git rm -f CHANGELOG-*.md || return 1 |
There was a problem hiding this comment.
It looks like the CHANGELOG for the new release will already exist on master at this point, since it gets populated for alphas. Should we avoid deleting the one that matches the version in the branch name?
There was a problem hiding this comment.
Yes, that had got lost of the recent shuffle. Thanks. PTAL.
david-mcmahon
force-pushed
the
clear-changelogs-branch
branch
from
8e84644
to
8f95a56
Compare
|
/lgtm |
k8s-ci-robot
added
the
lgtm
david-mcmahon
force-pushed
the
clear-changelogs-branch
branch
from
8f95a56
to
d83d95d
Compare
david-mcmahon
force-pushed
the
clear-changelogs-branch
branch
from
d83d95d
to
5a9c0cf
Compare
Fixes kubernetes/kubernetes#59895
Fixes kubernetes/sig-release#85