diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 7dd3aff71011f..5410f3c03ab9f 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -13,15 +13,15 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[DocStringExtensions]] deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "88bb0edb352b16608036faadcc071adda068582a" +git-tree-sha1 = "c5714d9bcdba66389612dc4c47ed827c64112997" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.1" +version = "0.8.2" [[Documenter]] deps = ["Base64", "Dates", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "395fa1554c69735802bba37d9e7d9586fd44326c" +git-tree-sha1 = "1c593d1efa27437ed9dd365d1143c594b563e138" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.24.11" +version = "0.25.1" [[DocumenterLaTeX]] deps = ["Documenter", "Test"] @@ -58,9 +58,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[Parsers]] deps = ["Dates", "Test"] -git-tree-sha1 = "f8f5d2d4b4b07342e5811d2b6428e45524e241df" +git-tree-sha1 = "8077624b3c450b15c087944363606a6ba12f925e" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.0.2" +version = "1.0.10" [[Pkg]] deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] @@ -71,7 +71,7 @@ deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" [[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] +deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[Random]] diff --git a/doc/make.jl b/doc/make.jl index 1d7ac1615deb1..53e76e59dfc04 100644 --- a/doc/make.jl +++ b/doc/make.jl @@ -218,17 +218,18 @@ makedocs( # Define our own DeployConfig struct BuildBotConfig <: Documenter.DeployConfig end -function Documenter.deploy_folder(::BuildBotConfig; devurl, kwargs...) - haskey(ENV, "DOCUMENTER_KEY") || return nothing +function Documenter.deploy_folder(::BuildBotConfig; devurl, repo, branch, kwargs...) + haskey(ENV, "DOCUMENTER_KEY") || return Documenter.DeployDecision(; all_ok=false) if Base.GIT_VERSION_INFO.tagged_commit # Strip extra pre-release info (1.5.0-rc2.0 -> 1.5.0-rc2) ver = VersionNumber(VERSION.major, VERSION.minor, VERSION.patch, isempty(VERSION.prerelease) ? () : (VERSION.prerelease[1],)) - return "v$(ver)" + subfolder = "v$(ver)" + return Documenter.DeployDecision(; all_ok=true, repo, branch, subfolder) elseif Base.GIT_VERSION_INFO.branch == "master" - return devurl + return Documenter.DeployDecision(; all_ok=true, repo, branch, subfolder=devurl) end - return nothing + return Documenter.DeployDecision(; all_ok=false) end const devurl = "v$(VERSION.major).$(VERSION.minor)-dev"