Skip to content

Commit b9594b6

Browse files
committed
Merge branch 'master' into hr/abstol_reltol
2 parents 0869558 + dcba3f5 commit b9594b6

File tree

5 files changed

+32
-28
lines changed

5 files changed

+32
-28
lines changed

.github/workflows/Documenter.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Documentation
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags: '*'
8+
pull_request:
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v2
15+
- uses: julia-actions/setup-julia@latest
16+
with:
17+
version: '1.5'
18+
- name: Install dependencies
19+
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
20+
- name: Build and deploy
21+
env:
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
23+
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
24+
DOCUMENTER_DEBUG: 'true'
25+
run: julia --project=docs/ docs/make.jl

.travis.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
[![license](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000)](https://github.com/JuliaMath/IterativeSolvers.jl/blob/master/LICENSE)
44
[![Build Status](https://github.com/JuliaMath/IterativeSolvers.jl/workflows/CI/badge.svg)](https://github.com/JuliaMath/IterativeSolvers.jl/actions)
5-
[![Build Status on Linux](https://travis-ci.org/JuliaMath/IterativeSolvers.jl.svg?branch=master)](https://travis-ci.org/JuliaMath/IterativeSolvers.jl)
65
[![Codecov](http://codecov.io/github/JuliaMath/IterativeSolvers.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaMath/IterativeSolvers.jl?branch=master)
76
[![Coveralls](https://coveralls.io/repos/JuliaMath/IterativeSolvers.jl/badge.svg?branch=master&service=github)](https://coveralls.io/github/JuliaMath/IterativeSolvers.jl?branch=master)
87

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
33

44
[compat]
5-
Documenter = "~0.20"
5+
Documenter = "~0.26"

docs/make.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ using Documenter, IterativeSolvers
22

33
makedocs(
44
modules = [IterativeSolvers],
5-
format = :html,
5+
format = Documenter.HTML(
6+
# Disable pretty URLs during manual testing
7+
prettyurls = get(ENV, "CI", nothing) == "true",
8+
# Set canonical URL to GitHub pages URL
9+
canonical = "https://juliamath.github.io/IterativeSolvers.jl/stable"
10+
),
611
doctest = false,
712
clean = true,
813
sitename = "IterativeSolvers.jl",

0 commit comments

Comments
 (0)