-
Notifications
You must be signed in to change notification settings - Fork 40k
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
escape $$ in asciidoc when generating api-reference pages #17298
escape $$ in asciidoc when generating api-reference pages #17298
Conversation
c2ff38f
to
2c61291
Compare
@@ -50,11 +50,11 @@ SWAGGER_PATH="${REPO_DIR}/api/swagger-spec/" | |||
|
|||
echo "Reading swagger spec from: ${SWAGGER_PATH}" | |||
|
|||
docker run -u $(id -u) --rm -v $V1_TMP_IN_HOST:/output:z -v ${SWAGGER_PATH}:/swagger-source:z gcr.io/google_containers/gen-swagger-docs:v4 \ | |||
docker run -u $(id -u) --rm -v $V1_TMP_IN_HOST:/output:z -v ${SWAGGER_PATH}:/swagger-source:z gcr.io/google_containers/gen-swagger-docs:v4.1 \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just pushed the v4.1 image to gcr.io.
Labelling this PR as size/S |
GCE e2e build/test failed for commit 2c61291372005274a367f7ab4212d51dbcc9d4b7. |
@@ -53,6 +53,9 @@ sed -i -e 's|<<any>>|link:definitions.html#_any[any]|g' ./paths.adoc | |||
# change the title of paths.adoc from "paths" to "operations" | |||
sed -i 's|== Paths|== Operations|g' ./paths.adoc | |||
|
|||
# $$ has special meaning in asciidoc, we need to escape it | |||
sed -i 's|\$\$|+++$$+++|g' ./definitions.adoc |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Who does the unescaping? (Removing +++)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
asciidoctor does that 2 lines later.
LGTM, modulo a clarifying question |
@k8s-bot test this please |
GCE e2e build/test failed for commit 2c61291372005274a367f7ab4212d51dbcc9d4b7. |
@k8s-bot test this please |
GCE e2e build/test failed for commit 2c61291372005274a367f7ab4212d51dbcc9d4b7. |
@k8s-bot test this please |
GCE e2e test build/test passed for commit 2c61291372005274a367f7ab4212d51dbcc9d4b7. |
@caesarxuchao - please rebase |
2c61291
to
099855d
Compare
PR changed after LGTM, removing LGTM. |
Adding back the LGTM after rebase. Thank you @wojtek-t for the reminder. |
GCE e2e test build/test passed for commit 099855d7a702bdd06b23d2bfa73bae8cef4ee3e5. |
@caesarxuchao Jenkins is failing with |
099855d
to
21d8ad3
Compare
Thanks. It should be fixed now. |
PR changed after LGTM, removing LGTM. |
GCE e2e test build/test passed for commit 21d8ad3. |
Automatic merge from submit-queue |
Auto commit by PR queue bot
manual cherry-pick #17298 to release-1.1
…e-1.1 manual cherry-pick kubernetes#17298 to release-1.1
…e-1.1 manual cherry-pick kubernetes#17298 to release-1.1
Fix #17155 on head.
cc @orfjackal