Merge pull request #452 from acpaquette/doc_updates_2

Doc build changes

.github/workflows/aws_doc_deploy.yml

@@ -2,7 +2,7 @@ name: aws-doc-deploy
 
 on:
   workflow_run:
-    workflows: ["Doc-Build"]
+    workflows: ["Pull-Request-CI"]
     branches: [main]
     types: 
       - completed
@@ -19,9 +19,23 @@ jobs:
         with:
           submodules: true
           fetch-depth: 0
-      - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
+      - uses: conda-incubator/setup-miniconda@3b0f2504dd76ef23b6d31f291f4913fb60ab5ff3
         with:
-          name: docs_folder
+          miniconda-version: "latest"
+          activate-environment: usgscsm
+          environment-file: doc_environment.yml
+          auto-activate-base: false
+          auto-update-conda: true
+
+      - name: Check doc build environment
+        run: |
+          conda list
+
+      - name: Build Docs
+        run: |
+          cd docs
+          doxygen Doxyfile.in
+          sphinx-build -b html source public
             
       - name: Set AWS credentials for upload
         uses: aws-actions/configure-aws-credentials@0e613a0980cbf65ed5b322eb7a1e075d28913a83

.github/workflows/ci_testing.yml

@@ -44,3 +44,31 @@ jobs:
         run: |
           cd build
           ctest -VV
+
+  Build-Docs:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -el {0}
+    steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+        with:
+          submodules: true
+          fetch-depth: 0
+      - uses: conda-incubator/setup-miniconda@3b0f2504dd76ef23b6d31f291f4913fb60ab5ff3
+        with:
+          miniconda-version: "latest"
+          activate-environment: usgscsm
+          environment-file: doc_environment.yml
+          auto-activate-base: false
+          auto-update-conda: true
+
+      - name: Check doc build environment
+        run: |
+          conda list
+
+      - name: Build Docs
+        run: |
+          cd docs
+          doxygen Doxyfile.in
+          sphinx-build -b html source public

.github/workflows/doc_build.yml

-name: Doc-Build
-
-on:
-  pull_request:
-    branches:
-      - main
-  push:
-    branches:
-      - main
-
-jobs:
-  Build-Docs:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash -el {0}
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-        with:
-          submodules: true
-          fetch-depth: 0
-      - uses: conda-incubator/setup-miniconda@3b0f2504dd76ef23b6d31f291f4913fb60ab5ff3
-        with:
-          miniconda-version: "latest"
-          activate-environment: usgscsm
-          environment-file: doc_environment.yml
-          auto-activate-base: false
-          auto-update-conda: true
-
-      - name: Check doc build environment
-        run: |
-          conda list
-
-      - name: Build Docs
-        run: |
-          cd docs
-          doxygen Doxyfile.in
-          sphinx-build -b html source public
-
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
-        with:
-          name: docs_folder
-          path: docs/public/
\ No newline at end of file