Merge pull request #3419 from GEOS-ESM/fix-mapl2-docs

v2: Try to fix docs
GEOS-ESM · Feb 12, 2025 · 5feb630 · 5feb630
2 parents 61f9fc4 + 45becb2
commit 5feb630
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/.github/actions/deploy-ford-docs/action.yml b/.github/actions/deploy-ford-docs/action.yml
@@ -9,9 +9,6 @@ inputs:
   doc-folder:
     description: "The folder containing the documentation to deploy"
     required: true
-  token:
-    description: "The GitHub token to use for authentication"
-    required: true
   target-folder:
     description: "The folder to deploy to"
     required: false
@@ -49,7 +46,7 @@ runs:
         repository: Goddard-Fortran-Ecosystem/gFTL
         path: gFTL
         fetch-depth: 1
-        ref: v1.14.0
+        ref: v1.15.2
 
     - name: Build gFTL
       run: |
@@ -71,6 +68,5 @@ runs:
       if: github.event_name == 'push' && github.repository == 'GEOS-ESM/MAPL' && ( startsWith( github.ref, 'refs/tags/v' ) || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release/MAPL-v3' )
       with:
         folder: ${{ inputs.doc-folder }}
-        token: ${{ inputs.token }}
         target-folder: ${{ inputs.target-folder }}
 
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -30,7 +30,6 @@ jobs:
           # relative path to the ford input file.
           ford-input: docs-with-remote-esmf.md
           doc-folder: docs/Ford/doc
-          token: ${{ secrets.GITHUB_TOKEN }}
 
   build-and-deploy-dev-docs:
     runs-on: ubuntu-latest
@@ -50,5 +49,4 @@ jobs:
           # relative path to the ford input file.
           ford-input: docs-with-remote-esmf.public_private_protected.md
           doc-folder: docs/Ford/dev-doc
-          token: ${{ secrets.GITHUB_TOKEN }}
           target-folder: dev-doc
diff --git a/docs/Ford/docs-with-remote-esmf.md b/docs/Ford/docs-with-remote-esmf.md
@@ -7,8 +7,8 @@ coloured_edges: true
 graph_maxdepth: 4
 graph_maxnodes: 32
 include: ../../include/
-         ../../gFTL/install/GFTL-1.14/include/v1
-         ../../gFTL/install/GFTL-1.14/include/v2
+         ../../gFTL/install/GFTL-1.15/include/v1
+         ../../gFTL/install/GFTL-1.15/include/v2
 exclude: **/EsmfRegridder.F90
          **/FieldBLAS_IntrinsicFunctions.F90
          **/GeomManager.F90

diff --git a/docs/Ford/docs-with-remote-esmf.public_private_protected.md b/docs/Ford/docs-with-remote-esmf.public_private_protected.md
@@ -8,8 +8,8 @@ coloured_edges: true
 graph_maxdepth: 4
 graph_maxnodes: 32
 include: ../../include/
-         ../../gFTL/install/GFTL-1.14/include/v1
-         ../../gFTL/install/GFTL-1.14/include/v2
+         ../../gFTL/install/GFTL-1.15/include/v1
+         ../../gFTL/install/GFTL-1.15/include/v2
 exclude: **/EsmfRegridder.F90
          **/FieldBLAS_IntrinsicFunctions.F90
          **/GeomManager.F90

diff --git a/docs/Ford/ford-ci.md b/docs/Ford/ford-ci.md
@@ -8,8 +8,8 @@ coloured_edges: true
 graph_maxdepth: 4
 graph_maxnodes: 32
 include: ../../include/
-         ../../gFTL/install/GFTL-1.14/include/v1
-         ../../gFTL/install/GFTL-1.14/include/v2
+         ../../gFTL/install/GFTL-1.15/include/v1
+         ../../gFTL/install/GFTL-1.15/include/v2
 exclude: **/EsmfRegridder.F90
          **/FieldBLAS_IntrinsicFunctions.F90
          **/GeomManager.F90