fix versionize-docs.sh and mark-new-version.sh to rewrite links to release branch rather than to tag #16553
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Labelling this PR as size/S |
k8s-github-robot
added
the
size/S
|
I don't think this is right. We should discuss further in #16522. We do, for official releases, (which is what |
ikehz
added
the
area/release-eng
|
GCE e2e test build/test passed for commit 43f047414e32c0ca4fc9510eeafde60143f7eeba. |
|
|
||
| if [ "$#" -lt 1 ]; then | ||
| echo "Usage: versionize-docs <release-version>" | ||
| echo "Usage: versionize-docs.sh <release-version>, e.g., versionize-docs.sh release-1.1." |
There was a problem hiding this comment.
<release-branch> rather than <release-version>
| @@ -27,11 +27,12 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. | |||
|
|
|||
| NEW_VERSION=${1-} | |||
There was a problem hiding this comment.
It would be less confusing to rename this variable to RELEASE_BRANCH.
caesarxuchao
force-pushed
the
rewrite-build-scripts
branch
from
43f0474 to
1eabd09
Compare
|
@bgrant0607 fixed. PTAL. Thanks. |
| @@ -59,11 +60,11 @@ done | |||
| for doc in "${md_files[@]}"; do | |||
| $SED -ri \ | |||
| -e '/<!-- BEGIN STRIP_FOR_RELEASE -->/,/<!-- END STRIP_FOR_RELEASE -->/d' \ | |||
| -e "s|(releases.k8s.io)/[^/]+|\1/${NEW_VERSION}|g" \ | |||
| -e "s|(releases.k8s.io)/[^/]+|\1/${RELEASE_BRANCH}|g" \ | |||
| "${doc}" | |||
|
|
|||
| # Replace /HEAD in html preview links with /NEW_VERSION. | |||
There was a problem hiding this comment.
s/NEW_VERSION/RELEASE_BRANCH/
…lease branch rather than to tag
caesarxuchao
force-pushed
the
rewrite-build-scripts
branch
from
1eabd09 to
819cbbe
Compare
|
LGTM |
|
Merging |
bgrant0607
added a commit
that referenced
this pull request
Oct 30, 2015
fix versionize-docs.sh and mark-new-version.sh to rewrite links to release branch rather than to tag
bgrant0607
added a commit
that referenced
this pull request
Oct 30, 2015
…#16553-upstream-release-1.1 Automated cherry pick of #16553
|
GCE e2e test build/test passed for commit 1eabd09430ebc25026cbfbf35c548323deff2306. |
|
GCE e2e test build/test passed for commit 819cbbe. |
shyamjvs
pushed a commit
to shyamjvs/kubernetes
that referenced
this pull request
Dec 1, 2016
…y-pick-of-#16553-upstream-release-1.1 Automated cherry pick of kubernetes#16553
shouhong
pushed a commit
to shouhong/kubernetes
that referenced
this pull request
Feb 14, 2017
…y-pick-of-#16553-upstream-release-1.1 Automated cherry pick of kubernetes#16553
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #16522.
@nikhiljindal @janetkuo @bgrant0607