Skip to content

Upgrade all CI to Sphinx 1.8.5 #13903

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

Merged
merged 1 commit into from
Jun 28, 2020
Merged

Upgrade all CI to Sphinx 1.8.5 #13903

merged 1 commit into from
Jun 28, 2020

Conversation

wouterj
Copy link
Member

@wouterj wouterj commented Jun 25, 2020

No description provided.

@wouterj
Copy link
Member Author

wouterj commented Jun 25, 2020

@fabpot it seems like your Sphinx-PHP repository is not in sync with the changes you made on symfony.com? At least, the code I can see on GitHub are not compatible with Sphinx 1.8.5, which I heard you're now using on symfony.com.

@fabpot
Copy link
Member

fabpot commented Jun 25, 2020

That's quite possible. I'm going to submit a PR soon.

@fabpot
Copy link
Member

fabpot commented Jun 25, 2020

See fabpot/sphinx-php#45

@wouterj
Copy link
Member Author

wouterj commented Jun 25, 2020

Hmm, so the PHP domain extension that is now installed overwrites the :class: role of the Sphinx PHP package with its own class role (Referencing classes defined in the Sphinx PHP domain). I'm not sure why this error isn't fired on symfony.com

@fabpot
Copy link
Member

fabpot commented Jun 25, 2020

I don't remember why I used the PHP domain extension, I think we can safely remove it.

@wouterj
Copy link
Member Author

wouterj commented Jun 26, 2020

@OskarStark do you maybe have some time to help out with the gitHub actions here? As you can see in the SymfonyCloud deployment, the build works fine (same locally), but it somehow fails on GitHub actions with an error I just fixed. Is there some cache that messes up the actions?

@wouterj
Copy link
Member Author

wouterj commented Jun 27, 2020

I've also cleaned up the build process a bit:

  • Removed unused dependencies from the requirements file
  • Installed the RTD theme using pip instead of copying the contents in our repository
  • Slightly tweaking the RTD theme to have same "feel" as the Symfony doc, while using the RTD looks. @javiereguiluz do you agree with the visual changes made in the SymfonyCloud deployments?

@javiereguiluz
Copy link
Member

Wouter, thanks for these improvements. Yes, I like the visual changes you did. But I'd prefer if we don't make more changes ... because I believe it's "wasting" time. If RTD theme changes and breaks the changes you did ... we need to dedicate some effort to fix it. I think it's not worth it. We only need docs to be readable ... I don't think "visual parity" or "visual fidelity" with symfony.com is important or needed.

@wouterj
Copy link
Member Author

wouterj commented Jun 27, 2020

Yes, agreed. We should not "waste" time here, so I used the official RTD extension points + highlight and font family changes. Doing anything more (e.g. implementing configuration blocks or the like) is likely to break and doesn't improve much.

@wouterj wouterj force-pushed the sphinx-1.8.5 branch 3 times, most recently from 0e1ac9f to 54b9812 Compare June 27, 2020 12:03
@wouterj
Copy link
Member Author

wouterj commented Jun 27, 2020

Fyi, this PR makes a change that is not yet done in the symfony.com build process: disabling the Sphinx Domains (to avoid conflicts with Symfony's own extension). This PR proves that the official docs aren't using Sphinx domains. We're checking internally if this applies to all projects build on symfony.com. I'll merge once I can confirm that these changes are applied on symfony.com as well (to avoid inconsistencies between the real build and our CI builds).

@fabpot
Copy link
Member

fabpot commented Jun 28, 2020

I've just deployed symfony.com without the phpdomain extension... which also fixes the line numbers that were missing for PHP code snippets.

@wouterj
Copy link
Member Author

wouterj commented Jun 28, 2020

Thank you Fabien and Javier for the help and quick responses!

@fabpot seems like line numbers are still missing from PHP code examples: https://symfony.com/doc/current/security/experimental_authenticators.html#creating-a-custom-authenticator

@wouterj wouterj merged commit bd78896 into symfony:3.4 Jun 28, 2020
@wouterj wouterj deleted the sphinx-1.8.5 branch June 28, 2020 08:32
@fabpot
Copy link
Member

fabpot commented Jun 28, 2020

@wouterj I have not re-built docs on prod and we have cache. I think it will be fixed automatically in the next few hours/days as docs are rebuilt and caches expire. 🤞

@wouterj
Copy link
Member Author

wouterj commented Jun 28, 2020

Ah sorry, I thought a deploy implied a doc re-build (and seems like the :class: roles where already updated to the non-php domain situation). Let's be patient then.

@wouterj
Copy link
Member Author

wouterj commented Jun 29, 2020

@fabpot I'm sorry, line numbers are still hidden: https://symfony.com/doc/current/notifier#creating-sending-notifications (there is a new doc build, as the XML example above this link was updated based on a commit from yesterday). I'll take a look later this week if I can find a fix for this. One would think that it's a commonly needed feature for documentations

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants