Skip to content

Commit 9ab68f9

Browse files
IanButterworthfredrikekre
authored andcommitted
Update Documenter to 0.25.1. (#36983)
Co-authored-by: Ian <[email protected]> Co-authored-by: Fredrik Ekre <[email protected]> (cherry picked from commit 5be3a54)
1 parent 193cf5d commit 9ab68f9

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

doc/Manifest.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
1313

1414
[[DocStringExtensions]]
1515
deps = ["LibGit2", "Markdown", "Pkg", "Test"]
16-
git-tree-sha1 = "88bb0edb352b16608036faadcc071adda068582a"
16+
git-tree-sha1 = "c5714d9bcdba66389612dc4c47ed827c64112997"
1717
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
18-
version = "0.8.1"
18+
version = "0.8.2"
1919

2020
[[Documenter]]
2121
deps = ["Base64", "Dates", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
22-
git-tree-sha1 = "395fa1554c69735802bba37d9e7d9586fd44326c"
22+
git-tree-sha1 = "1c593d1efa27437ed9dd365d1143c594b563e138"
2323
uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
24-
version = "0.24.11"
24+
version = "0.25.1"
2525

2626
[[DocumenterLaTeX]]
2727
deps = ["Documenter", "Test"]
@@ -58,9 +58,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"
5858

5959
[[Parsers]]
6060
deps = ["Dates", "Test"]
61-
git-tree-sha1 = "f8f5d2d4b4b07342e5811d2b6428e45524e241df"
61+
git-tree-sha1 = "8077624b3c450b15c087944363606a6ba12f925e"
6262
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
63-
version = "1.0.2"
63+
version = "1.0.10"
6464

6565
[[Pkg]]
6666
deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
@@ -71,7 +71,7 @@ deps = ["Unicode"]
7171
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
7272

7373
[[REPL]]
74-
deps = ["InteractiveUtils", "Markdown", "Sockets"]
74+
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
7575
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
7676

7777
[[Random]]

doc/make.jl

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,17 +217,18 @@ makedocs(
217217

218218
# Define our own DeployConfig
219219
struct BuildBotConfig <: Documenter.DeployConfig end
220-
function Documenter.deploy_folder(::BuildBotConfig; devurl, kwargs...)
221-
haskey(ENV, "DOCUMENTER_KEY") || return nothing
220+
function Documenter.deploy_folder(::BuildBotConfig; devurl, repo, branch, kwargs...)
221+
haskey(ENV, "DOCUMENTER_KEY") || return Documenter.DeployDecision(; all_ok=false)
222222
if Base.GIT_VERSION_INFO.tagged_commit
223223
# Strip extra pre-release info (1.5.0-rc2.0 -> 1.5.0-rc2)
224224
ver = VersionNumber(VERSION.major, VERSION.minor, VERSION.patch,
225225
isempty(VERSION.prerelease) ? () : (VERSION.prerelease[1],))
226-
return "v$(ver)"
226+
subfolder = "v$(ver)"
227+
return Documenter.DeployDecision(; all_ok=true, repo, branch, subfolder)
227228
elseif Base.GIT_VERSION_INFO.branch == "master"
228-
return devurl
229+
return Documenter.DeployDecision(; all_ok=true, repo, branch, subfolder=devurl)
229230
end
230-
return nothing
231+
return Documenter.DeployDecision(; all_ok=false)
231232
end
232233

233234
const devurl = "v$(VERSION.major).$(VERSION.minor)-dev"

0 commit comments

Comments
 (0)