From 3e1b845f7c504fbf12ca4d7bf2f359f8b3edaaea Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Mon, 24 Mar 2025 16:40:44 +1300 Subject: [PATCH 1/4] docs: use [sources] --- .github/workflows/CI.yml | 7 ------- Makefile | 2 +- docs/Project.toml | 3 +++ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e9b45fae6..561476c6d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -62,8 +62,6 @@ jobs: JULIAHUB_TOKEN: ${{ secrets.JULIAHUB_TOKEN }} - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v5 - with: - file: lcov.info aqua: name: Aqua @@ -128,8 +126,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v5 - with: - file: lcov.info doctest: name: Doctest @@ -143,12 +139,9 @@ jobs: - name: Set up documentation environment run: | using Pkg - Pkg.develop(path=".") Pkg.instantiate() shell: julia --color=yes --project=docs/ {0} - name: Check doctests run: julia --color=yes --project=docs/ --code-coverage docs/make.jl --doctest - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v5 - with: - file: lcov.info diff --git a/Makefile b/Makefile index 2454001da..a669b15c2 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ help: docs/Manifest.toml: docs/Project.toml @echo "Instantiating the docs/ environment:" - ${JULIA} --color=yes --project=docs/ -e 'using Pkg; Pkg.develop(path="."); Pkg.instantiate()' + ${JULIA} --color=yes --project=docs/ -e 'using Pkg; Pkg.instantiate()' docs-manifest: rm -f docs/Manifest.toml diff --git a/docs/Project.toml b/docs/Project.toml index 40ea80183..c2c571a0d 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -12,3 +12,6 @@ URIs = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" Changelog = "1" Documenter = "1" DocumenterMermaid = "0.1" + +[sources] +JuliaHub = { path = ".." } From 2ff97e5d364394733abf9ad17b3be539b305a353 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Mon, 24 Mar 2025 17:20:50 +1300 Subject: [PATCH 2/4] add token.. --- .github/workflows/CI.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 561476c6d..5b9040feb 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -62,6 +62,8 @@ jobs: JULIAHUB_TOKEN: ${{ secrets.JULIAHUB_TOKEN }} - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v5 + with: + token: ${{ secrets.CODECOV_TOKEN }} aqua: name: Aqua @@ -126,6 +128,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v5 + with: + token: ${{ secrets.CODECOV_TOKEN }} doctest: name: Doctest @@ -145,3 +149,5 @@ jobs: run: julia --color=yes --project=docs/ --code-coverage docs/make.jl --doctest - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v5 + with: + token: ${{ secrets.CODECOV_TOKEN }} From 8fed13d3d9a24ad90ff173d95e925a0593af4f40 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Mon, 24 Mar 2025 17:30:01 +1300 Subject: [PATCH 3/4] fix doctest check --- .github/workflows/CI.yml | 7 ++----- Makefile | 3 +++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5b9040feb..05e30461c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -141,12 +141,9 @@ jobs: version: "1.9" - uses: julia-actions/julia-buildpkg@v1 - name: Set up documentation environment - run: | - using Pkg - Pkg.instantiate() - shell: julia --color=yes --project=docs/ {0} + run: make docs-manifest - name: Check doctests - run: julia --color=yes --project=docs/ --code-coverage docs/make.jl --doctest + run: make check-doctests - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v5 with: diff --git a/Makefile b/Makefile index a669b15c2..2985e74ea 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,9 @@ docs: docs/Manifest.toml fix-doctests: docs/Manifest.toml ${JULIA} --project=docs/ docs/make.jl --fix-doctests +check-doctests: docs/Manifest.toml + ${JULIA} --project=docs/ docs/make.jl --doctest + changelog: ${JULIA} --project=docs/ docs/changelog.jl From a322520e6857b62b9e166b367ba4edbff3ea0ca6 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Mon, 24 Mar 2025 19:05:22 +1300 Subject: [PATCH 4/4] doctest --- .github/workflows/CI.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 05e30461c..8dd0a6129 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -138,7 +138,9 @@ jobs: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: - version: "1.9" + # we'll restrict doctests to a minor version, to avoid failures due + # to printing differences between Julia (minor) versions + version: "1.11" - uses: julia-actions/julia-buildpkg@v1 - name: Set up documentation environment run: make docs-manifest