Skip to content

Commit

Permalink
Fixing gh-pages push issue
Browse files Browse the repository at this point in the history
  • Loading branch information
tusharmakkar08 committed Nov 4, 2016
1 parent 7b6ff3d commit c71b3a5
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions update_documentation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ echo "Repo url is $URL"
PUSH_URL="https://$GIT_USER:$GIT_PASS@${URL:8}"

git remote set-url origin ${PUSH_URL}
git push --set-upstream origin gh-pages

echo "Checking out $FROM_BRANCH..." && \
git fetch origin ${FROM_BRANCH}:${FROM_BRANCH} && \
Expand All @@ -47,7 +46,7 @@ git merge ${FROM_BRANCH} && \

# Push changes back to remote vcs
echo "Pushing changes..." && \
git push && \
git push origin gh-pages && \
echo "Merge complete!" || \
echo "Error Occurred. Merge failed"

Expand All @@ -59,4 +58,4 @@ echo "Sphinx not able to generate HTML"

git status && git add . &&
git commit -m "Auto updating documentation from $CURRENT_BRANCH" &&
git push && echo "Documentation pushed"
git push origin gh-pages && echo "Documentation pushed"

0 comments on commit c71b3a5

Please sign in to comment.