Fix another bug with automatised pushing documentation

Cumulus · Jul 31, 2014 · 427ae35 · 427ae35
1 parent 07a7db7
commit 427ae35
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.travis-ci.sh b/.travis-ci.sh
@@ -16,11 +16,17 @@ if [ "$TRAVIS_REPO_SLUG" == "Cumulus/Syndic" ] \
 
   echo -e "Publishing ocamldoc...\n"
 
-  make doc
-
   git config --global user.email "romain.calascibetta@gmail.com"
   git config --global user.name "dinosaure"
-  git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/Cumulus/Syndic gh-pages
+  git clone --quiet --branch=gh-pages \
+    https://${GH_TOKEN}@github.com/Cumulus/Syndic .documentation
+
+  cd .documentation
+  git fetch
+  git merge master
+
+  ./configure
+  make doc
 
   git add -f doc/
 

diff --git a/_oasis b/_oasis
@@ -20,7 +20,7 @@ Document "Syndic"
   Type:                 ocamlbuild (0.4)
   BuildTools:           ocamldoc
   Title:                "Syndic"
-  PostCommand:          cp Syndic.docdir/* doc/
+  PostCommand:          cp Syndic.docdir/*.html doc/
   XOCamlbuildPath:      lib
   XOCamlbuildLibraries: syndic
   XOCamlbuildExtraArgs: