From c6d1f8467ccefaccfe37870752453c4285e2ab0a Mon Sep 17 00:00:00 2001 From: Ben Mackay Date: Fri, 22 Jul 2022 16:56:24 -0400 Subject: [PATCH 1/4] Bump DocStringExtensions compat to include v0.9 (#1886) (cherry picked from commit 396ee24391c081792e2f3cc32bb47699d7ddc3dd) --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 0e9ebaea8e..28e3b71d6f 100644 --- a/Project.toml +++ b/Project.toml @@ -19,7 +19,7 @@ Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" [compat] ANSIColoredPrinters = "0.0.1" -DocStringExtensions = "0.4, 0.5, 0.6, 0.7, 0.8" +DocStringExtensions = "0.4, 0.5, 0.6, 0.7, 0.8, 0.9" IOCapture = "0.2" JSON = "0.19, 0.20, 0.21" julia = "1" From 408b2414ccb50742b5641dc40569a737dd444ef2 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Sat, 23 Jul 2022 13:35:30 +1200 Subject: [PATCH 2/4] Add CHANGELOG for 0.27.22 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 883ed5cf36..d44ed75097 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Documenter.jl changelog +## Version `v0.27.22` + +* ![Maintenance][badge-maintenance] Documenter is now compatible with DocStringExtensions v0.9. ([#1885][github-1885], [#1886][github-1886]) + ## Version `v0.27.21` * ![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 @@ [github-1865]: https://github.com/JuliaDocs/Documenter.jl/pull/1865 [github-1870]: https://github.com/JuliaDocs/Documenter.jl/issues/1870 [github-1871]: https://github.com/JuliaDocs/Documenter.jl/pull/1871 +[github-1885]: https://github.com/JuliaDocs/Documenter.jl/issues/1885 +[github-1886]: https://github.com/JuliaDocs/Documenter.jl/pull/1886 [julia-38079]: https://github.com/JuliaLang/julia/issues/38079 From 369a9750989931ef40f5c23f3a9b8fdcf18fcfec Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Sat, 23 Jul 2022 13:35:55 +1200 Subject: [PATCH 3/4] Set version to 0.27.22 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 28e3b71d6f..42a4306aba 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "Documenter" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.27.21" +version = "0.27.22" [deps] ANSIColoredPrinters = "a4c015fc-c6ff-483c-b24f-f7ea428134e9" From 7b104e029f536eb3e86872e852246e9b1e8d33fe Mon Sep 17 00:00:00 2001 From: Fredrik Ekre Date: Sun, 24 Jul 2022 12:22:34 +0200 Subject: [PATCH 4/4] Patch CI script for Julia 1.0 to avoid resolver errors when resolving the test env. --- .github/workflows/CI.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 92e4c587d9..e1a207eabb 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -36,6 +36,14 @@ jobs: arch: ${{ matrix.arch }} show-versioninfo: true - uses: julia-actions/cache@v1 + # Add DocumenterTools here to avoid resolver errors when resolving the test env + # see JuliaDocs/Documenter.jl#1887 + - name: 'Workaround Pkg resolver error on 1.0' + shell: julia --project=. {0} + run: | + using Pkg + Pkg.add("DocumenterTools") + if: matrix.version == '1.0' - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 - uses: julia-actions/julia-processcoverage@v1