Update crops/irrigation Tech Note chapter for 6.0

.github/workflows/docs-build-and-deploy.yml

@@ -61,7 +61,7 @@ jobs:
         id: build-docs
         run: |
           cd doc
-          ./build_docs_to_publish -d --site-root https://escomp.github.io/CTSM
+          ./build_docs_to_publish -d --site-root https://escomp.github.io/CTSM --verbose
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@0252fc4ba7626f0298f0cf00902a25c6afc77fa8  # v3

.github/workflows/docs-common.yml

@@ -43,13 +43,13 @@ jobs:
         uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f  # v3
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('doc/ctsm-docs_container/requirements.txt') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('doc/doc-builder/doc-build-container/requirements.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install Python requirements
         if: ${{ ! inputs.use_conda }}
         run: |
-          pip install -r doc/ctsm-docs_container/requirements.txt
+          pip install -r doc/doc-builder/doc-build-container/requirements.txt
 
       # Do this if using conda
       - name: Set up conda environment
@@ -73,7 +73,7 @@ jobs:
         if: success() || failure()
         run: |
           if ${{ inputs.use_conda }}; then
-            cd doc && conda run -n ${{ inputs.conda_env_name }} ./build_docs -b ${PWD}/_build -c
+            cd doc && conda run -n ${{ inputs.conda_env_name }} ./build_docs -b ${PWD}/_build -c --verbose
           else
-            cd doc && ./build_docs -b ${PWD}/_build -c
+            cd doc && ./build_docs -b ${PWD}/_build -c --verbose
           fi

.github/workflows/docs-update-ctsm_pylib.yml

@@ -6,15 +6,15 @@ on:
     branches: ['*']
     paths:
       - 'python/conda_env_ctsm_py.txt'
-      - 'doc/ctsm-docs_container/requirements.txt'
+      - 'doc/doc-builder'
       - '.github/workflows/docs-common.yml'
       - '.github/workflows/docs-update-dependency-common.yml'
 
   pull_request:
     # Run on pull requests that change the listed files
     paths:
       - 'python/conda_env_ctsm_py.txt'
-      - 'doc/ctsm-docs_container/requirements.txt'
+      - 'doc/doc-builder'
       - '.github/workflows/docs-common.yml'
       - '.github/workflows/docs-update-dependency-common.yml'
 

.github/workflows/docs-update-dependency-common.yml

@@ -22,7 +22,8 @@ jobs:
 
     # Don't run on forks, because test_container_eq_ctsm_pylib.sh uses
     # build_docs_to_publish, which will look for branch(es) that forks
-    # may not have
+    # may not have.
+    # To run locally with `act`, include `--env GITHUB_REPOSITORY=ESCOMP/CTSM` in the call.
     if: ${{ github.repository == 'ESCOMP/CTSM' }}
 
     runs-on: ubuntu-latest
@@ -44,6 +45,7 @@ jobs:
           environment-file: ${{ inputs.conda_env_file }}
           channels: conda-forge
           auto-activate-base: false
+          miniconda-version: "latest"
 
       - name: Compare docs built with container vs. ctsm_pylib
         run: |

.github/workflows/docs.yml

@@ -63,7 +63,7 @@ jobs:
         run: |
           set -o pipefail
           mkdir -p build-logs
-          cd doc && PYTHONUNBUFFERED=1 ./build_docs -b ${PWD}/_build -c -d 2>&1 | tee >(sed -E $'s/\x1b\\[[0-9;]*[a-zA-Z]//g' > "${GITHUB_WORKSPACE}/build-logs/build.log")
+          cd doc && PYTHONUNBUFFERED=1 ./build_docs -b ${PWD}/_build -c -d --verbose 2>&1 | tee >(sed -E $'s/\x1b\\[[0-9;]*[a-zA-Z]//g' > "${GITHUB_WORKSPACE}/build-logs/build.log")
         # The tee writes build.log for the PR comment (posted by docs-pr-failure-post-comment.yml); the inner sed strips ANSI color codes that would otherwise render as garbage in the comment.
         # PYTHONUNBUFFERED=1 because otherwise the teed log will be out of order
 

.github/workflows/python-tests.yml

@@ -24,6 +24,10 @@ jobs:
       # Checkout the code
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
 
+      - name: Check out doc-builder, which has a requirements.txt we need
+        run: |
+          bin/git-fleximod update doc-builder
+
       # Set up the conda environment
       - uses: conda-incubator/setup-miniconda@2defc80cc6f4028b1780c50faf08dd505d698976  # v3
         with:
@@ -44,6 +48,10 @@ jobs:
       # Checkout the code
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
 
+      - name: Check out doc-builder, which has a requirements.txt we need
+        run: |
+          bin/git-fleximod update doc-builder
+
       # Set up the conda environment
       - uses: conda-incubator/setup-miniconda@2defc80cc6f4028b1780c50faf08dd505d698976  # v3
         with:

.gitmodules

@@ -124,7 +124,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial
 [submodule "doc-builder"]
 path = doc/doc-builder
 url = https://github.com/ESMCI/doc-builder
-fxtag = v3.2.1
+fxtag = v3.5.1
 fxrequired = ToplevelOptional
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/doc-builder