From 74947fb2470ba0d24de0cd4ddf088fb9192f04e3 Mon Sep 17 00:00:00 2001
From: odow <o.dowson@gmail.com>
Date: Thu, 21 Sep 2023 09:02:48 +1200
Subject: [PATCH] Update documentation build script

---
 .github/workflows/documentation.yml |  6 +++---
 docs/Project.toml                   |  4 ++++
 docs/make.jl                        | 29 ++++++++++++++++++-----------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 7907e460..e53ed7e7 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -11,14 +11,14 @@ jobs:
     name: Documentation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: julia-actions/setup-julia@latest
         with:
           version: '1'
       - name: Install Dependencies
-        run: julia --project=docs -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
+        run: julia --project=docs --color=yes -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
       - name: Build and Deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
-        run: julia --project=docs docs/make.jl
+        run: julia --project=docs --color=yes docs/make.jl
diff --git a/docs/Project.toml b/docs/Project.toml
index dfa65cd1..30133efa 100644
--- a/docs/Project.toml
+++ b/docs/Project.toml
@@ -1,2 +1,6 @@
 [deps]
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+WaterModels = "7c60b362-08f4-5b14-8680-cd67a3e18348"
+
+[compat]
+Documenter = "1"
diff --git a/docs/make.jl b/docs/make.jl
index 6ef3c64b..dca14486 100644
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -1,17 +1,21 @@
-using Documenter, WaterModels
+import Documenter
+import WaterModels
 
-makedocs(
-    modules = [WaterModels],
-    format = Documenter.HTML(analytics="UA-367975-10", mathengine=Documenter.MathJax(), prettyurls=false),
+Documenter.makedocs(
     sitename = "WaterModels",
     authors = "Byron Tasseff and contributors",
+    format = Documenter.HTML(
+        analytics="UA-367975-10",
+        mathengine = Documenter.MathJax(),
+        prettyurls = false,
+    ),
     pages = [
         "Home" => "index.md",
         "Manual" => [
             "Getting Started" => "quickguide.md",
             "Network Data Format" => "network-data.md",
             "Result Data Format" => "result-data.md",
-            "Mathematical Models" => "math-model.md"
+            "Mathematical Models" => "math-model.md",
         ],
         "Library" => [
             "Network Formulations" => "formulations.md",
@@ -19,16 +23,19 @@ makedocs(
             "Modeling Components" => [
                 "Objective" => "objective.md",
                 "Variables" => "variables.md",
-                "Constraints" => "constraints.md"
+                "Constraints" => "constraints.md",
             ],
-            "File I/O" => "parser.md"
+            "File I/O" => "parser.md",
         ],
-        "Developer" => "developer.md",
-        "Examples" => "examples.md"
+        "Devegloper" => "developer.md",
+        "Examples" => "examples.md",
     ],
-    warnonly = true
+    clean = true,
+    modules = [WaterModels],
+    warnonly = true,
 )
 
-deploydocs(
+Documenter.deploydocs(
     repo = "github.com/lanl-ansi/WaterModels.jl.git",
+    push_preview = true,
 )