You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/08/31 19:42:13 UTC

[GitHub] szha closed pull request #12413: fixed docs/website build checkout bug

szha closed pull request #12413: fixed docs/website build checkout bug
URL: https://github.com/apache/incubator-mxnet/pull/12413
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/docs/build_version_doc/build_all_version.sh b/docs/build_version_doc/build_all_version.sh
index d36f1f5edc6..350c75b084b 100755
--- a/docs/build_version_doc/build_all_version.sh
+++ b/docs/build_version_doc/build_all_version.sh
@@ -114,7 +114,7 @@ function checkout () {
   # Overriding configs later will cause a conflict here, so stashing...
   git stash
   # Fails to checkout if not available locally, so try upstream
-  git checkout "$repo_folder" || git branch $repo_folder "upstream/$repo_folder"
+  git checkout "$repo_folder" || git branch $repo_folder "upstream/$repo_folder" && git checkout "$repo_folder" || exit 1
   if [ $tag == 'master' ]; then
     git pull
   fi
@@ -174,4 +174,4 @@ done
 
 echo "Now you may want to run update_all_version.sh to create the production layout with the versions dropdown and other per-version corrections."
 echo "The following pattern is recommended (tags, default tag, url base):"
-echo "./update_all_version.sh "$tags_to_display " master http://mxnet.incubator.apache.org/"
+echo "./update_all_version.sh \"$2\" master http://mxnet.incubator.apache.org/"
diff --git a/docs/settings.ini b/docs/settings.ini
index f999b3efde2..b8e486e58e8 100644
--- a/docs/settings.ini
+++ b/docs/settings.ini
@@ -14,7 +14,7 @@ r_docs = 0
 scala_docs = 1
 
 [document_sets_v1.2.0]
-clojure_docs = 1
+clojure_docs = 0
 doxygen_docs = 1
 r_docs = 0
 scala_docs = 1


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services