Skip to content

Documentation: use output from new doc-ci with odoc 3 features #3123

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

Closed
wants to merge 164 commits into from

Conversation

panglesd
Copy link
Contributor

This PR uses the output from the new doc-ci @jonludlam has been working on. The docs are built with odoc 3, benefiting from several features, some of them that were previously "emulated" on this repo (such as a global sidebar).

This currently implements:

  • A global sidebar as computed by odoc 3
  • Better breadcrumbs
  • Source code pages
  • Redirections for url changes

This PR is not yet complete, however all pushed commits can already be reviewed, so I think it was already worth opening.
I tried to make the commits as atomic as possible to ease the review, which can then be made "commit by commit". All commits compile, although they may fail at runtime (eg due to wrong format for deserializing).

I'll post updates and warn when I consider the PR complete!

(The branch was based on main. Should I rebase on staging, or should staging be rebased on main?)

github-actions bot and others added 30 commits January 8, 2025 07:11
…d tutorial (ocaml#2909)

* Remove section about installing and using tree tool

* remove extra newline

* Update data/tutorials/getting-started/1_02_your_first_ocaml_program.md

* Update data/tutorials/getting-started/1_02_your_first_ocaml_program.md

---------

Co-authored-by: sabine <[email protected]>
Co-authored-by: Cuihtlauac Alvarado <[email protected]>
* fix date format from merlin changelog

* changelog and release: OCaml 5.3.0

* Extended highlight description

* Arthur Symons' translation of Verlaine verses
* Fix issue 2911

Fix issue ocaml#2911

* Swap sentences

---------

Co-authored-by: Cuihtlauac ALVARADO <[email protected]>
Co-authored-by: Cuihtlauac ALVARADO <[email protected]>
Co-authored-by: Cuihtlauac ALVARADO <[email protected]>
Co-authored-by: Cuihtlauac ALVARADO <[email protected]>
* Add load testing utility

* Add k6 load testing set up

* Update scripts

* Use localhost URL for loadtesting

This should generally be used for testing capacity locally, not in a
live distribution. The latter stresses the actual servers and can lead
to your IP being blocked.

* Indicate load testing from HACKING.md
…ntributions.md file (ocaml#2907)

* Update CONTRIBUTING.md PR Template Added

* Create PULL_REQUEST_TEMPLATE.md file added

* Update CONTRIBUTING.md added PR template section

* Update CONTRIBUTING.md updated the OCml Cookbook Recipes Section

Added Guidelines for New Recipes.

* some rearranging, introducing a PR template selector template

---------

Co-authored-by: sabine <[email protected]>
* Survive tailwindcss binary

* When building target specific binary
  - If already available in installed world, copy
  - If not found, download
  - Using %{bin-available} does not work, targets are always available

* Define a package tailwindcss which allows installing tailwindcss in
local switch

* Making tailwindcss survive dune clean:
  - dune build tailwindcss.install
  - dune install -p tailwindcss
  - This does not work if written in dune file. Everything takes place
    indide _build

Note: While debugging, doing progn / chmod / copy in tailwindcss rules
made curl happen take place twice.

* Add HACKING note

---------

Co-authored-by: Cuihtlauac ALVARADO <[email protected]>
…2938)

* enable linking to YouTube videos from conferences pages

* fmt
* enable linking to YouTube videos from conferences pages

* fmt

* (data) add FUN OCaml 2024 information to conferences page
sabine and others added 24 commits May 5, 2025 13:15
* (data) add OCaml Platform Newsletter Feb - Apr 2025
* add link to Discuss Forums with CTA to comment
Co-authored-by: Jon Ludlam <[email protected]>
It was added in ocaml/odoc#1314 and needs not be ignored

Co-authored-by: Jon Ludlam <[email protected]>
Co-authored-by: Jon Ludlam <[email protected]>
Odoc 3 allows to have breadcrumbs without href. Currently, the breadcrumbs are
still computed by ocaml.org, but soon it will be taken from odoc3's json output.

Co-authored-by: Jon Ludlam <[email protected]>
With odoc 3 and hierarchical documentation, breadcrumbs will include pages.

They are rendered with `/` between them (while other components are rendered
with `.` between them). So We can have `library1/Module.Submodule`.

Pages cannot yet happen since we still compute breadcrumbs ourselves.

Co-authored-by: Jon Ludlam <[email protected]>
@cuihtlauac
Copy link
Collaborator

Thanks @panglesd. Can you rebase on main? Should this be considered a draft?

@panglesd
Copy link
Contributor Author

It is already based on main, but the PR targets the staging branch.

I think the idea was to first merge on staging, and then test and publicly request for feedback.

Would it be fine if I just reopen the PR targeting the main branch? And if/when we decide to merge on staging first, we handle that at this time?

I was not sure whether it should be considered as a draft since the parts that are already in the branch are ready for review.

@cuihtlauac
Copy link
Collaborator

Right now, staging is broken. It's always best to be based on main, even when planning to deploy to staging.

Your PR touches many files and has many commits. Both seem unrelated to doc-ci and odoc3. Am I mistaken? If not, rebasing on an up-to-date main may help focus the PR on its matter.

@panglesd
Copy link
Contributor Author

Your PR touches many files and has many commits. Both seem unrelated to doc-ci and odoc3. Am I mistaken? If not, rebasing on an up-to-date main may help focus the PR on its matter.

This PR is already based on an up-to-date main. It is targeting staging while the branch to merge is based on main, so github is showing all commits that are part of main but not of staging.

I opened #3124 targeting main, superseding this PR.

@panglesd panglesd closed this May 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.