diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 609d04b817e2b..0c44dfb133428 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -16,10 +16,12 @@ uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" version = "0.5.0" [[Documenter]] -deps = ["Base64", "DocStringExtensions", "InteractiveUtils", "LibGit2", "Logging", "Markdown", "Pkg", "REPL", "Random", "Test", "Unicode"] -git-tree-sha1 = "9f2135e0e7ecb63f9c3ef73ea15a31d8cdb79bb7" +deps = ["Base64", "DocStringExtensions", "InteractiveUtils", "LibGit2", "Logging", "Markdown", "REPL", "Random", "Test", "Unicode"] +git-tree-sha1 = "9d4a932fad2b6543b97fe5bd9282746f15f01edf" +repo-rev = "fe/deploy-logic" +repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.20.0" +version = "0.20.0+" [[InteractiveUtils]] deps = ["LinearAlgebra", "Markdown"] @@ -72,7 +74,7 @@ deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[UUIDs]] -deps = ["Random", "SHA"] +deps = ["Random"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [[Unicode]] diff --git a/doc/make.jl b/doc/make.jl index f58c7a80b9a25..c4af2e872c0e9 100644 --- a/doc/make.jl +++ b/doc/make.jl @@ -173,11 +173,14 @@ makedocs( # 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 TRAVIS_REPO_SLUG since we deploy to a different repo +withenv("TRAVIS_REPO_SLUG" => "JuliaLang/docs.julialang.org") do deploydocs( - repo = "github.com/JuliaLang/julia.git", + repo = "github.com/JuliaLang/docs.julialang.org.git", target = joinpath(buildroot, "doc", "_build", "html", "en"), dirname = "en", devurl = "v1.1-dev", versions = ["v#.#", "v1.1-dev" => "v1.1-dev"] ) end +end