Merge pull request #209 from zbeekman/doc-deploy-fix

Fix documentation deployment issues

Author: jacobwilliams

CHANGELOG.md

@@ -144,7 +144,7 @@ via [PR \#144](https://github.com/jacobwilliams/json-fortran/pull/144) from  ([j
   [PR \#124](https://github.com/jacobwilliams/json-fortran/pull/124)
   from [zbeekman](https://github.com/zbeekman)
 - Migrate to
-  [Codecov.io](https://codecov.io/github/jacobwilliams/json-fortran?branch=master)
+  [Codecov.io](https://codecov.io/gh/jacobwilliams/json-fortran)
   [\#106](https://github.com/jacobwilliams/json-fortran/issues/106)
   via [PR \#107](https://github.com/jacobwilliams/json-fortran/pull/107)
   from [zbeekman](https://github.com/zbeekman)

CONTRIBUTING.md

@@ -36,15 +36,15 @@ Looking to contribute something to [JSON-Fortran](https://github.com/jacobwillia
   contribute. Please take a look at
   [the test coverage page](http://jacobwilliams.github.io/json-fortran/page/development-resources/json_module.F90.gcov.html)
   for a list of uncovered procedures, and at the
-  [Codecov.io suggestions page](https://codecov.io/github/jacobwilliams/json-fortran/features/suggestions)
+  [Codecov.io coverage status](https://codecov.io/gh/jacobwilliams/json-fortran)
   to find procedures and lines of code that are still uncovered by the
   [unit tests](https://github.com/jacobwilliams/json-fortran/tree/master/src/tests). It
   is worth pointing out that the majority of uncovered procedures are
   internal, overloaded procedures and can only be exercised by calling
   the corresponding generic procedure with input arguments that will
   resolve to the specific procedure in question. Let's keep the
   following graph trending upwards!
-  ![Codecov.io](https://codecov.io/github/jacobwilliams/json-fortran/branch.svg?branch=master)
+  ![Codecov.io](https://codecov.io/gh/jacobwilliams/json-fortran/branch/master/graphs/commits.svg)
 
 [top](#contributing-to-json-fortran)
 ## Pull Requests

README.md

@@ -164,6 +164,6 @@ Miscellaneous
 * For more information about JSON, see: <http://www.json.org/>
 * [json-fortran on Travis CI](https://travis-ci.org/jacobwilliams/json-fortran)
 * [json-fortran on Waffle.IO](https://waffle.io/jacobwilliams/json-fortran)
-* [json-fortran on Codecov.IO](https://codecov.io/github/jacobwilliams/json-fortran?branch=master)
+* [json-fortran on Codecov.IO](https://codecov.io/gh/jacobwilliams/json-fortran)
 
 [top](#json-fortran)

deploy.sh

@@ -11,26 +11,27 @@ if [ "$TRAVIS" ]; then #running under travis
 	if [ "$TRAVIS_BRANCH" = "master" ] && \
 	       [ "$TRAVIS_PULL_REQUEST" = "false" ] && \
 	       [ "$(ls -A "$TRAVIS_BUILD_DIR/doc")" ] ; then #not empty
-            git clone --branch=gh-pages "https://${GH_TOKEN}@github.com/$TRAVIS_REPO_SLUG" gh-pages
+            git clone -q --branch=gh-pages "https://${GH_TOKEN}@github.com/$TRAVIS_REPO_SLUG" gh-pages >/dev/null 2>&1
             cd gh-pages || exit 1
-	    rm -r css favicon.png fonts index.html interface js lists media module page proc \
-	       program search.html sourcefile src tipuesearch type
+	    rm -rf -- css fonts interface lists module proc search.html	src type favicon.png index.html \
+	       js media page program sourcefile	tipuesearch || true
 	    cp -r "$TRAVIS_BUILD_DIR"/doc/* .
-            git add -A # Add all the new files
-            git commit -m "Development documentation updated by travis job $TRAVIS_JOB_NUMBER for commits $TRAVIS_COMMIT_RANGE"
-            git push origin gh-pages
+            git add -A || true # Add all the new files
+            git commit -m "Development documentation updated by travis job $TRAVIS_JOB_NUMBER for commits $TRAVIS_COMMIT_RANGE" || true
+            git push -fq origin gh-pages > /dev/null 2>&1 || true
 	fi
 	# If publishing a new/updated tag, deploy it's documentation
 	if [ "$TRAVIS_TAG" ] && [ "$(ls -A "$TRAVIS_BUILD_DIR/doc")" ] ; then #not empty
 	    cd "$TRAVIS_BUILD_DIR" || exit 1
-	    git clone --branch=gh-pages "https://${GH_TOKEN}@github.com/$TRAVIS_REPO_SLUG" gh-pages
-	    sed "1 s/^/version: ${TRAVIS_TAG}\n/" json-fortran.md > json-fortran.tagged.md
+	    git clone -q --branch=gh-pages "https://${GH_TOKEN}@github.com/$TRAVIS_REPO_SLUG" gh-pages >/dev/null 2>&1
+	    sed "2 s/^/version: ${TRAVIS_TAG}\n/" json-fortran.md > json-fortran.tagged.md
+	    head json-fortran.tagged.md # Debug output
 	    # rebuild FORD documentation without pages, with version info, wiping out any existing tag folder
-	    ford -o "gh-pages/$TRAVIS_TAG" json-fortran.tagged.md
+	    ford --debug -o "gh-pages/$TRAVIS_TAG" json-fortran.tagged.md
 	    cd gh-pages || exit 1
 	    git add -A # add all new files in $TRAVIS_TAG/
 	    git commit -m "Tag/release documentation updated by travis job $TRAVIS_JOB_NUMBER for tag $TRAVIS_TAG $TRAVIS_COMMIT"
-	    git push origin gh-pages
+	    git push -f -q origin gh-pages >/dev/null 2>&1
 	fi
     fi
 fi

pages/development-resources/index.md

@@ -22,7 +22,7 @@ look at the
 automatically generated by
 [FoBiS.py](https://github.com/szaghi/FoBiS). If all procedures are
 listed as covered, then please take a look at the
-[Codecov.io coverage suggestions](https://codecov.io/github/jacobwilliams/json-fortran/features/suggestions?ref=master).
+[Codecov.io coverage info](https://codecov.io/gh/jacobwilliams/json-fortran/branch/master).
 
 # Scripts