Skip to content

Commit

Permalink
stop deploying to the release- folder
Browse files Browse the repository at this point in the history
  • Loading branch information
fredrikekre committed Apr 16, 2018
1 parent 7274404 commit 66b601d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
11 changes: 7 additions & 4 deletions src/Documenter.jl
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,10 @@ deploydocs(
)
```
When building the docs for a tag (i.e. a release) the documentation is deployed to
a directory with the tag name (i.e. `vX.Y.Z`) and to the `stable` directory.
Otherwise the docs are deployed to the `latest` directory.
# Keywords
**`root`** has the same purpose as the `root` keyword for [`makedocs`](@ref).
Expand Down Expand Up @@ -463,6 +467,9 @@ end
)
Handles pushing changes to the remote documentation branch.
When `tag` is empty the docs are deployed to the `latest` directory,
and when building docs for a tag they are deployed to a `vX.Y.Z` directory,
and also to the `stable` directory.
"""
function git_push(
root, temp, repo;
Expand Down Expand Up @@ -529,10 +536,6 @@ function git_push(
end
gitrm_copy(target_dir, tagged_dir)
Writers.HTMLWriter.generate_siteinfo_file(tagged_dir, tag)
# Build a `release-*.*` folder as well
release = "release-$(version.major).$(version.minor)"
gitrm_copy(target_dir, joinpath(dirname, release))
Writers.HTMLWriter.generate_siteinfo_file(joinpath(dirname, release), release)
end

# Create the versions.js file containing a list of all docs
Expand Down
2 changes: 1 addition & 1 deletion src/Writers/HTMLWriter.jl
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ function generate_version_file(dir::AbstractString)
end
open(joinpath(dir, "versions.js"), "w") do buf
println(buf, "var DOC_VERSIONS = [")
for group in (named_folders, release_folders, tag_folders)
for group in (named_folders, tag_folders, release_folders)
for folder in sort!(group, rev = true)
println(buf, " \"", folder, "\",")
end
Expand Down

0 comments on commit 66b601d

Please sign in to comment.