From 7de5b769f0317ada25b81c25e506f10b4df8edb4 Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Tue, 15 Jun 2021 00:20:22 -0400
Subject: [PATCH 1/3] Test docs build against multiple bundle branches

Add matrix build use checkout actions "ref"
---
 .github/workflows/build-documentation.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
index 9240d7854..336683e03 100644
--- a/.github/workflows/build-documentation.yml
+++ b/.github/workflows/build-documentation.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
 
-  #Check for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action. 
+  # Check for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action.
   check-for-duplicates:
     runs-on: ubuntu-latest
     # Map a step output to a job output
@@ -25,12 +25,17 @@ jobs:
           do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'
 
   build-docs:
-    #Continue if check-for-duplicates found no duplicates. Always runs for pull-requests.
+    # Continue if check-for-duplicates found no duplicates. Always runs for pull-requests.
     needs: check-for-duplicates
     if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }}
     runs-on: ubuntu-18.04
     timeout-minutes: 15
 
+    strategy:
+      fail-fast: false
+      matrix:
+        bundle-branch: [main, integration-candidate]
+
     steps:
       - name: Install Dependencies
         run: sudo apt-get install doxygen graphviz -y
@@ -41,6 +46,7 @@ jobs:
         with:
           repository: nasa/cFS
           submodules: true
+          ref: ${{matrix.bundle-branch}}
 
       - name: Checkout submodule
         uses: actions/checkout@v2

From 06c006486a99e61b27785d0ee869ae8a6ce39c3a Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Tue, 15 Jun 2021 00:31:37 -0400
Subject: [PATCH 2/3] Add matrix build to usersguide

---
 .github/workflows/build-documentation.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
index 336683e03..5ff0d4be6 100644
--- a/.github/workflows/build-documentation.yml
+++ b/.github/workflows/build-documentation.yml
@@ -10,7 +10,8 @@ env:
 
 jobs:
 
-  # Check for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action.
+  # Check for duplicate actions. Skips push actions if there is a matching or
+  # duplicate pull-request action.
   check-for-duplicates:
     runs-on: ubuntu-latest
     # Map a step output to a job output
@@ -25,7 +26,8 @@ jobs:
           do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'
 
   build-docs:
-    # Continue if check-for-duplicates found no duplicates. Always runs for pull-requests.
+    # Continue if check-for-duplicates found no duplicates. Always runs for
+    # pull-requests.
     needs: check-for-duplicates
     if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }}
     runs-on: ubuntu-18.04
@@ -84,12 +86,18 @@ jobs:
           fi
 
   build-usersguide:
-    #Continue if check-for-duplicates found no duplicates. Always runs for pull-requests.
+    # Continue if check-for-duplicates found no duplicates. Always runs for
+    # pull-requests.
     needs: check-for-duplicates
     if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }}
     runs-on: ubuntu-18.04
     timeout-minutes: 15
 
+    strategy:
+      fail-fast: false
+      matrix:
+        bundle-branch: [main, integration-candidate]
+
     steps:
       - name: Install Dependencies
         run: sudo apt-get install doxygen graphviz -y
@@ -100,6 +108,7 @@ jobs:
         with:
           repository: nasa/cFS
           submodules: true
+          ref: ${{matrix.bundle-branch}}
 
       - name: Checkout submodule
         uses: actions/checkout@v2

From 68ab5006121f08a0c7b37b22b539ceceb8b344e0 Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Tue, 15 Jun 2021 00:39:54 -0400
Subject: [PATCH 3/3] Update doc folder

---
 .github/workflows/build-documentation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
index 5ff0d4be6..b9a3b7c07 100644
--- a/.github/workflows/build-documentation.yml
+++ b/.github/workflows/build-documentation.yml
@@ -128,7 +128,7 @@ jobs:
       - name: Build Usersguide
         run: |
           make usersguide > make_usersguide_stdout.txt 2> make_usersguide_stderr.txt
-          mv build/doc/warnings.log usersguide_warnings.log
+          mv build/docs/warnings.log usersguide_warnings.log
 
       - name: Archive Users Guide Build Logs
         uses: actions/upload-artifact@v2