Skip to content

Commit 4cc7fe1

Browse files
authored
Merge pull request #1887 from JuliaDocs/mp/0.27.22
Backports for 0.27.22
2 parents 186172b + 7b104e0 commit 4cc7fe1

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

.github/workflows/CI.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ jobs:
3636
arch: ${{ matrix.arch }}
3737
show-versioninfo: true
3838
- uses: julia-actions/cache@v1
39+
# Add DocumenterTools here to avoid resolver errors when resolving the test env
40+
# see JuliaDocs/Documenter.jl#1887
41+
- name: 'Workaround Pkg resolver error on 1.0'
42+
shell: julia --project=. {0}
43+
run: |
44+
using Pkg
45+
Pkg.add("DocumenterTools")
46+
if: matrix.version == '1.0'
3947
- uses: julia-actions/julia-buildpkg@v1
4048
- uses: julia-actions/julia-runtest@v1
4149
- uses: julia-actions/julia-processcoverage@v1

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Documenter.jl changelog
22

3+
## Version `v0.27.22`
4+
5+
* ![Maintenance][badge-maintenance] Documenter is now compatible with DocStringExtensions v0.9. ([#1885][github-1885], [#1886][github-1886])
6+
37
## Version `v0.27.21`
48

59
* ![Bugfix][badge-bugfix] Fix a regression where Documenter throws an error on systems that do not have Git available. ([#1870][github-1870], [#1871][github-1871])
@@ -1080,6 +1084,8 @@
10801084
[github-1865]: https://github.com/JuliaDocs/Documenter.jl/pull/1865
10811085
[github-1870]: https://github.com/JuliaDocs/Documenter.jl/issues/1870
10821086
[github-1871]: https://github.com/JuliaDocs/Documenter.jl/pull/1871
1087+
[github-1885]: https://github.com/JuliaDocs/Documenter.jl/issues/1885
1088+
[github-1886]: https://github.com/JuliaDocs/Documenter.jl/pull/1886
10831089
<!-- end of issue link definitions -->
10841090

10851091
[julia-38079]: https://github.com/JuliaLang/julia/issues/38079

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "Documenter"
22
uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
3-
version = "0.27.21"
3+
version = "0.27.22"
44

55
[deps]
66
ANSIColoredPrinters = "a4c015fc-c6ff-483c-b24f-f7ea428134e9"
@@ -19,7 +19,7 @@ Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
1919

2020
[compat]
2121
ANSIColoredPrinters = "0.0.1"
22-
DocStringExtensions = "0.4, 0.5, 0.6, 0.7, 0.8"
22+
DocStringExtensions = "0.4, 0.5, 0.6, 0.7, 0.8, 0.9"
2323
IOCapture = "0.2"
2424
JSON = "0.19, 0.20, 0.21"
2525
julia = "1"

0 commit comments

Comments
 (0)