TEST - fix nasa#447

skliper · Apr 11, 2022 · 541f75b · 541f75b
1 parent 8b4b106
commit 541f75b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
@@ -42,15 +42,15 @@ jobs:
         run: |
           cp ./cfe/cmake/Makefile.sample Makefile
           cp -r ./cfe/cmake/sample_defs sample_defs
-          
+
       - name: Make Prep
         run: make prep
 
       - name: Install Doxygen Dependencies
         run: sudo apt-get install doxygen graphviz -y
 
       - name: Install PDF Generation Dependencies
-        if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
+        #if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
         run: |
           sudo apt-get install texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra
 
@@ -62,10 +62,15 @@ jobs:
           key: doc-setup-buildnum-${{ github.run_number }}
 
   build-usersguide:
-      - needs: setup-doc-build
-        matrix:
-          targetname: [mission-doc, cfe-usersguide, osal-apiguide]
+    needs: setup-doc-build
+    runs-on: ubuntu-18.04
 
+    strategy:
+      fail-fast: false
+      matrix:
+        targetname: [mission-doc, cfe-usersguide, osal-apiguide]
+
+    steps:
       - name: Get Setup Cache
         id: cache-doc-setup
         uses: actions/cache@v2
@@ -75,8 +80,7 @@ jobs:
 
       - name: Build Document
         run: |
-          make -C build ${{ matrix.targetname }} > make_${{ matrix.targetname }}_stdout.txt \
-                                                2> make_${{ matrix.targetname }}_stderr.txt
+          make -C build ${{ matrix.targetname }} > make_${{ matrix.targetname }}_stdout.txt 2> make_${{ matrix.targetname }}_stderr.txt
           mv build/docs/${{ matrix.targetname }}/${{ matrix.targetname }}-warnings.log ${{ matrix.targetname }}-warnings.log
           
       - name: Archive Document Build Logs
@@ -103,7 +107,7 @@ jobs:
           fi
           
       - name: Generate PDF
-        if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
+        #if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
         run: |
           mkdir deploy
           cd ./build/docs/${{ matrix.targetname }}/latex
@@ -121,7 +125,8 @@ jobs:
   deploy:
     needs: build-usersguide
     name: Deploy documents
-    if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
+    #if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
+    runs-on: ubuntu-18.04
 
     steps:
       - name: Get All Artifacts

diff --git a/cfe b/cfe
+1 −3		cmake/Makefile.sample
+2 −2		cmake/cfe-usersguide.doxyfile.in
+3 −3		cmake/mission-doc.doxyfile.in
+10 −12		cmake/mission_build.cmake