Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

fixed docs/website build checkout bug #12413

Merged
merged 2 commits into from
Aug 31, 2018
Merged

fixed docs/website build checkout bug #12413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
785d98c
fixed checkout bug; fixed echo statement
aaronmarkham Aug 30, 2018
4a339a6
turning off clojure docs for v1.2.0
aaronmarkham Aug 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/build_version_doc/build_all_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/"
2 changes: 1 addition & 1 deletion docs/settings.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ r_docs = 0
scala_docs = 1

[document_sets_v1.2.0]
Copy link
Member

@szha szha Aug 31, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see two copies of document_sets_1.2.0. Is that intended?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aaron explained offline that for each version one entry is for release branch while the other is for release tag. Currently, the pipeline is set up so that docs are built from branches.

clojure_docs = 1
clojure_docs = 0
doxygen_docs = 1
r_docs = 0
scala_docs = 1
Expand Down