working on CI doc deploy

Author: jacobwilliams

.github/workflows/CI.yml

@@ -58,18 +58,6 @@ jobs:
         --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
         --slave /usr/bin/gcov gcov /usr/bin/gcov-${GCC_V}
 
-    - name: Compile_with_build_mkdocs
-      if: matrix.gcc_v == 7
-      run: |
-        GFORTRAN=gfortran-${{matrix.gcc_v}}
-        GCOV=gcov-${{matrix.gcc_v}}
-        # build with build.sh, make documentation, run unit tests
-        # and perform coverage analysis
-        ./build.sh --coverage --skip-documentation
-        ./build.sh --coverage --enable-unicode
-        CODE_COVERAGE="yes"
-        DEPLOY_DOCUMENTATION="yes"
-
     - name: Compile_with_build
       if: matrix.gcc_v != 7
       run: |
@@ -78,24 +66,32 @@ jobs:
         # build with build.sh, run unit tests
         ./build.sh --skip-documentation
         ./build.sh --skip-documentation --enable-unicode
-        CODE_COVERAGE="no"
-        DEPLOY_DOCUMENTATION="no"
 
     - name: Compile_with_cmake
+      # CMake build with unit tests, no documentation, with coverage analysis
+      # No unicode so that coverage combined with the build script will cover unicode
+      # and non-unicode code paths
       if: matrix.gcc_v == 9
       run: |
         GFORTRAN=gfortran-${{matrix.gcc_v}}
         GCOV=gcov-${{matrix.gcc_v}}
-        # CMake build with unit tests, no documentation, with coverage analysis
-        # No unicode so that coverage combined with the build script will cover unicode
-        # and non-unicode code paths
         mkdir cmake-build
         cd cmake-build
         cmake ..
         make -j 4 check
 
+    - name: Compile_with_build_mkdocs
+      # build with build.sh, make documentation, run unit tests
+      # and perform coverage analysis - used for doc deployment
+      if: matrix.gcc_v == 7
+      run: |
+        GFORTRAN=gfortran-${{matrix.gcc_v}}
+        GCOV=gcov-${{matrix.gcc_v}}
+        ./build.sh --coverage --skip-documentation
+        ./build.sh --coverage --enable-unicode
+
     - name: Deploy Documentation for master
-      if: github.ref == 'refs/heads/master' && $DEPLOY_DOCUMENTATION == 'yes'
+      if: matrix.gcc_v == 7 && github.ref == 'refs/heads/master'
       uses: JamesIves/[email protected]
       with:
         branch: gh-pages # The branch the action should deploy to.
@@ -107,7 +103,7 @@ jobs:
     - name: Rebuild documentation for tagged release
       env:
         TAGNAME: ${{ steps.vars.outputs.tag }}
-      if: $DEPLOY_DOCUMENTATION == 'yes' && startsWith(github.ref, 'refs/tags/')
+      if: matrix.gcc_v == 7 && startsWith(github.ref, 'refs/tags/')
       run: |
         echo ${TAGNAME}
         rm -rf doc
@@ -117,15 +113,15 @@ jobs:
     - name: Deploy documentation for tagged release
       env:
         TAGNAME: ${{ steps.vars.outputs.tag }}
-      if: $DEPLOY_DOCUMENTATION == 'yes' && startsWith(github.ref, 'refs/tags/')
+      if: matrix.gcc_v == 7 && startsWith(github.ref, 'refs/tags/')
       uses: JamesIves/[email protected]
       with:
         branch: gh-pages # The branch the action should deploy to.
         folder: doc  # The folder the action should deploy.
         target-folder: prev/$TAGNAME  # deploy to a version-specific folder
 
     - name: Upload coverage
-      if: $CODE_COVERAGE == 'yes'
+      if: matrix.gcc_v == 7
       run: |
         rm json_*.F90-*unicode.gcov || true
         mv json_*.F90.gcov src/

.travis-old/deploy.sh

@@ -7,31 +7,31 @@ set -o errexit
 set -o verbose
 if [ "$TRAVIS" ]; then #running under travis
     if $TRAVIS_SECURE_ENV_VARS ; then
-	# only try to update master's development documentation
-	if [ "$TRAVIS_BRANCH" = "master" ] && \
-	       [ "$TRAVIS_PULL_REQUEST" = "false" ] && \
-	       [ "$(ls -A "$TRAVIS_BUILD_DIR/doc")" ] ; then #not empty
+    # only try to update master's development documentation
+    if [ "$TRAVIS_BRANCH" = "master" ] && \
+           [ "$TRAVIS_PULL_REQUEST" = "false" ] && \
+           [ "$(ls -A "$TRAVIS_BUILD_DIR/doc")" ] ; then #not empty
             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 -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/* .
+        rm -rf -- css fonts graphs 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 || 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 its documentation
-	if [ "$TRAVIS_TAG" ] && [ "$(ls -A "$TRAVIS_BUILD_DIR/doc")" ] ; then #not empty
-	    cd "$TRAVIS_BUILD_DIR" || exit 1
-	    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 --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 -f -q origin gh-pages >/dev/null 2>&1
-	fi
+    fi
+    # If publishing a new/updated tag, deploy its documentation
+    if [ "$TRAVIS_TAG" ] && [ "$(ls -A "$TRAVIS_BUILD_DIR/doc")" ] ; then #not empty
+        cd "$TRAVIS_BUILD_DIR" || exit 1
+        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 --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 -f -q origin gh-pages >/dev/null 2>&1
+    fi
     fi
 fi