diff --git a/build_tools/circle/push_doc.sh b/build_tools/circle/push_doc.sh index 24239297d67b6..e8af577344831 100755 --- a/build_tools/circle/push_doc.sh +++ b/build_tools/circle/push_doc.sh @@ -12,22 +12,30 @@ fi DOC_REPO="scikit-learn.github.io" -MSG="Pushing the docs for revision for branch: $CIRCLE_BRANCH, commit $CIRCLE_SHA1" +if [ "$CIRCLE_BRANCH" = "master" ] +then + dir=dev +else + # Strip off .X + dir="${CIRCLE_BRANCH::-2}" +fi + +MSG="Pushing the docs to $dir/ for branch: $CIRCLE_BRANCH, commit $CIRCLE_SHA1" cd $HOME if [ ! -d $DOC_REPO ]; then git clone "git@github.com:scikit-learn/"$DOC_REPO".git"; fi cd $DOC_REPO -git checkout master -git reset --hard origin/master -git rm -rf dev/ && rm -rf dev/ -cp -R $HOME/scikit-learn/doc/_build/html/stable dev +git checkout $CIRCLE_BRANCH +git reset --hard origin/$CIRCLE_BRANCH +git rm -rf $dir/ && rm -rf $dir/ +cp -R $HOME/scikit-learn/doc/_build/html/stable $dir git config --global user.email "olivier.grisel+sklearn-ci@gmail.com" git config --global user.name $USERNAME git config --global push.default matching -git add -f dev/ -git commit -m "$MSG" dev +git add -f $dir/ +git commit -m "$MSG" $dir git push echo $MSG diff --git a/circle.yml b/circle.yml index dd26453fa2e9c..2e4fa5c3a9370 100644 --- a/circle.yml +++ b/circle.yml @@ -13,7 +13,7 @@ test: - cat ~/log.txt && if grep -q "Traceback (most recent call last):" ~/log.txt; then false; else true; fi deployment: push: - branch: master + branch: /^master$|^[0-9]+\.[0-9]+\.X$/ commands: - bash build_tools/circle/push_doc.sh general: