Upgrade Documenter to 0.24.0. (JuliaLang#33922)

halleysfifthinc · Nov 23, 2019 · 1ee8965 · 1ee8965
1 parent 3f620ad
commit 1ee8965
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 30 deletions.
diff --git 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 = "0513f1a8991e9d83255e0140aace0d0fc4486600"
+git-tree-sha1 = "88bb0edb352b16608036faadcc071adda068582a"
 uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
-version = "0.8.0"
+version = "0.8.1"
 
 [[Documenter]]
-deps = ["Base64", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
-git-tree-sha1 = "1dba3854d6b0e35b3ed77f84419efbaf81f28886"
+deps = ["Base64", "Dates", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
+git-tree-sha1 = "0e52069b5970cb27234153f578227947565152c5"
 uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
-version = "0.23.1"
+version = "0.24.0"
 
 [[DocumenterLaTeX]]
 deps = ["Documenter", "Test"]
@@ -54,9 +54,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 
 [[Parsers]]
 deps = ["Dates", "Test"]
-git-tree-sha1 = "db2b35dedab3c0e46dc15996d170af07a5ab91c9"
+git-tree-sha1 = "0139ba59ce9bc680e2925aec5b7db79065d60556"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "0.3.6"
+version = "0.3.10"
 
 [[Pkg]]
 deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]

diff --git a/doc/make.jl b/doc/make.jl
@@ -190,28 +190,23 @@ makedocs(
  pages = PAGES,
 )
 
-# Only deploy docs from 64bit Linux to avoid committing multiple versions of the same
-# docs from different workers.
-if "deploy" in ARGS && Sys.ARCH === :x86_64 && Sys.KERNEL === :Linux
-
-# Override a few environment variables to deploy to the appropriate repository,
-# encode things like branch, whether it's built on a tag, etc....
-env_mappings = [
- "TRAVIS_REPO_SLUG" => "JuliaLang/docs.julialang.org",
- "TRAVIS_BRANCH" => Base.GIT_VERSION_INFO.branch,
-]
-
-if Base.GIT_VERSION_INFO.tagged_commit
- push!(env_mappings, "TRAVIS_TAG" => "v$(Base.VERSION)")
+# Define our own DeployConfig
+struct BuildBotConfig <: Documenter.DeployConfig end
+function Documenter.deploy_folder(::BuildBotConfig; devurl, kwargs...)
+ haskey(ENV, "DOCUMENTER_KEY") || return nothing
+ if Base.GIT_VERSION_INFO.tagged_commit
+ return "v$(Base.VERSION)"
+ elseif Base.GIT_VERSION_INFO.branch == "master"
+ return devurl
+ end
+ return nothing
 end
 
-withenv(env_mappings...) do
- deploydocs(
- repo = "github.com/JuliaLang/docs.julialang.org.git",
- target = joinpath(buildroot, "doc", "_build", "html", "en"),
- dirname = "en",
- devurl = "v1.4-dev",
- versions = ["v#.#", "v1.4-dev" => "v1.4-dev"]
- )
-end
-end
+deploydocs(
+ repo = "github.com/JuliaLang/docs.julialang.org.git",
+ deploy_config = BuildBotConfig(),
+ target = joinpath(buildroot, "doc", "_build", "html", "en"),
+ dirname = "en",
+ devurl = "v1.4-dev",
+ versions = ["v#.#", "v1.4-dev" => "v1.4-dev"]
+)