Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak Documentation to try to get docs to build and deploy #70

Merged
merged 5 commits into from
Nov 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/Documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Documentation
on:
pull_request:
paths-ignore:
- 'README.md'
- 'README.md'
push:
paths-ignore:
- 'README.md'
- 'README.md'
branches:
- 'master'
- 'release-'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ deps/src/
# Build artifacts for creating documentation generated by the Documenter package
docs/build/
docs/site/
docs/src/generated/

# File generated by Pkg, the package manager, based on a corresponding Project.toml
# It records a fixed state of all packages used by the project. As such, it should not be
Expand Down
2 changes: 1 addition & 1 deletion docs/lit/examples/1-overview.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#---------------------------------------------------------

# This page illustrates the Julia package
# [`SpecialMatrices`](https://github.com/JuliaMatrices/SpecialMatrices.jl).
# [`SpecialMatrices`](https://github.com/JuliaLinearAlgebra/SpecialMatrices.jl).

# ### Setup

Expand Down
54 changes: 31 additions & 23 deletions docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,49 +1,59 @@
using SpecialMatrices
execute = isempty(ARGS) || ARGS[1] == "run"

org, reps = :JuliaLinearAlgebra, :SpecialMatrices
eval(:(using $reps))
using Documenter
using Literate

# based on:
# https://github.com/jw3126/UnitfulRecipes.jl/blob/master/docs/make.jl

# https://juliadocs.github.io/Documenter.jl/stable/man/syntax/#@example-block
ENV["GKSwstype"] = "100"
ENV["GKS_ENCODING"] = "utf-8"

# generate tutorials and how-to guides using Literate
# generate examples using Literate
lit = joinpath(@__DIR__, "lit")
src = joinpath(@__DIR__, "src")
notebooks = joinpath(src, "notebooks")
gen = joinpath(@__DIR__, "src/generated")

base = "$org/$reps.jl"
repo_root_url =
"https://github.com/$base/blob/main/docs/lit/examples"
nbviewer_root_url =
"https://nbviewer.org/github/$base/tree/gh-pages/dev/generated/examples"
binder_root_url =
"https://mybinder.org/v2/gh/$base/gh-pages?filepath=dev/generated/examples"

ENV["GKS_ENCODING"] = "utf-8"

DocMeta.setdocmeta!(SpecialMatrices, :DocTestSetup, :(using SpecialMatrices); recursive=true)
repo = eval(:($reps))
DocMeta.setdocmeta!(repo, :DocTestSetup, :(using $reps); recursive=true)

execute = true # Set to true for executing notebooks and documenter!
nb = false # Set to true to generate the notebooks
for (root, _, files) in walkdir(lit), file in files
splitext(file)[2] == ".jl" || continue
splitext(file)[2] == ".jl" || continue # process .jl files only
ipath = joinpath(root, file)
opath = splitdir(replace(ipath, lit=>src))[1]
Literate.markdown(ipath, opath, documenter = execute)
nb && Literate.notebook(ipath, notebooks, execute = execute)
opath = splitdir(replace(ipath, lit => gen))[1]
Literate.markdown(ipath, opath; documenter = execute, # run examples
repo_root_url, nbviewer_root_url, binder_root_url)
Literate.notebook(ipath, opath; execute = false, # no-run notebooks
repo_root_url, nbviewer_root_url, binder_root_url)
end


# Documentation structure
ismd(f) = splitext(f)[2] == ".md"
pages(folder) =
[joinpath(folder, f) for f in readdir(joinpath(src, folder)) if ismd(f)]
[joinpath("generated/", folder, f) for f in readdir(joinpath(gen, folder)) if ismd(f)]

isci = get(ENV, "CI", nothing) == "true"

format = Documenter.HTML(;
prettyurls = isci,
edit_link = "master",
canonical = "https://JuliaMatrices.github.io/SpecialMatrices.jl/stable/",
canonical = "https://$org.github.io/$repo.jl/stable/",
# assets = String[],
)

makedocs(;
modules = [SpecialMatrices],
sitename = "SpecialMatrices.jl",
modules = [repo],
sitename = "$repo.jl",
format,
pages = [
"Home" => "index.md",
Expand All @@ -54,14 +64,12 @@ makedocs(;

if isci
deploydocs(;
repo = "github.com/JuliaMatrices/SpecialMatrices.jl",
repo = "github.com/$base",
devbranch = "master",
devurl = "dev",
versions = ["stable" => "v^", "dev" => "dev"],
forcepush = true,
push_preview = true,
# see https://JuliaMatrices.github.io/SpecialMatrices.jl/previews/PR##
# push_preview = true,
# see https://$org.github.io/$repo.jl/previews/PR##
)
else
@warn "may need to: rm -r src/examples"
end