From 5094fc77e9ae1bf546f768e422b2a3fca61305e4 Mon Sep 17 00:00:00 2001 From: Krishnan Date: Tue, 24 Jul 2018 19:25:20 +0000 Subject: [PATCH 1/3] Fixing the version build to show 1.2.1 instead of 1.2.0 --- docs/build_version_doc/AddVersion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build_version_doc/AddVersion.py b/docs/build_version_doc/AddVersion.py index b625a2e1b6a3..6c60a12f5312 100755 --- a/docs/build_version_doc/AddVersion.py +++ b/docs/build_version_doc/AddVersion.py @@ -36,7 +36,7 @@ tag_list = list() with open('tag_list.txt', 'r') as tag_file: for line in tag_file: - tag_list.append(line.lstrip().rstrip()) + tag_list.append(line.lstrip().rstrip().replace("0.12.0","0.12.1").replace("1.2.0","1.2.1")) version_str = '' \ From aac54ed2704e35ade500b57ea9f3f8e40f50fc02 Mon Sep 17 00:00:00 2001 From: Krishnan Date: Tue, 24 Jul 2018 22:33:39 +0000 Subject: [PATCH 2/3] Adding two different list of tags - one for build and one for display --- ci/docker/runtime_functions.sh | 2 +- docs/build_version_doc/build_all_version.sh | 28 +++++++++++++++------ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 566ff18204d0..21cd88542e0e 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -812,7 +812,7 @@ build_docs() { set -ex pushd . cd /work/mxnet/docs/build_version_doc - ./build_all_version.sh $1 + ./build_all_version.sh $1 $2 ./update_all_version.sh $2 $3 $4 cd VersionedWeb tar -zcvf ../artifacts.tgz . diff --git a/docs/build_version_doc/build_all_version.sh b/docs/build_version_doc/build_all_version.sh index 56b80e3a0fc8..02816dd746f6 100755 --- a/docs/build_version_doc/build_all_version.sh +++ b/docs/build_version_doc/build_all_version.sh @@ -30,13 +30,24 @@ set -x if [ -z "$1" ] then - echo "Please provide a list of version tags you wish to run." + echo "Please provide a list of version tags you wish to build." exit 1 else IFS=$';' - tag_list=$1 - echo "Using these tags: $tag_list" - for tag in $tag_list; do echo $tag; done + tags_to_build=$1 + echo "Using these tags: $tags_to_build" + for tag in $tags_to_build; do echo $tag; done +fi + +if [ -z "$2" ] + then + echo "Please provide a list of version tags you wish to display." + exit 1 + else + IFS=$';' + tags_to_display=$2 + echo "Using these tags: $tags_to_display" + for tag in $tags_to_display; do echo $tag; done fi mxnet_url="https://github.com/apache/incubator-mxnet.git" @@ -53,8 +64,9 @@ if [ ! -d "$built" ]; then mkdir "$built/versions" fi -# Build all versions and use latest version(First version number in $tag_list) as landing page. -for tag in $tag_list; do +# Build all versions and use latest version(First version number in $tags_to_build) as landing page. +i = 0; +for tag in $tags_to_build; do cd "$mxnet_folder" git fetch if [ $tag == 'master' ] @@ -72,12 +84,14 @@ for tag in $tag_list; do make clean make html USE_OPENMP=1 || exit 1 cd ../../ - file_loc="$built/versions/$tag" + ancillary = $tags_to_display[$i] + file_loc="$built/versions/$ancillary" if [ -d "$file_loc" ] ; then rm -rf "$file_loc" fi mkdir "$file_loc" cp -a "$mxnet_folder/docs/_build/html/." "$file_loc" + i = $((i+1)); 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." From f9d2eb551e8a0e15874353f9fa5bb1558f20def5 Mon Sep 17 00:00:00 2001 From: Krishnan Date: Tue, 24 Jul 2018 22:54:24 +0000 Subject: [PATCH 3/3] Removing the unnecessary manual version replace --- docs/build_version_doc/AddVersion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build_version_doc/AddVersion.py b/docs/build_version_doc/AddVersion.py index 6c60a12f5312..b625a2e1b6a3 100755 --- a/docs/build_version_doc/AddVersion.py +++ b/docs/build_version_doc/AddVersion.py @@ -36,7 +36,7 @@ tag_list = list() with open('tag_list.txt', 'r') as tag_file: for line in tag_file: - tag_list.append(line.lstrip().rstrip().replace("0.12.0","0.12.1").replace("1.2.0","1.2.1")) + tag_list.append(line.lstrip().rstrip()) version_str = '' \