Skip to content

[stable33] backport: Add sphinx-lint CI + fix all RST violations (PR#14769 + PR#14771) to stable33#14814

Merged
skjnldsv merged 10 commits into
stable33from
copilot/backport-14769-and-add-14771
May 12, 2026
Merged

[stable33] backport: Add sphinx-lint CI + fix all RST violations (PR#14769 + PR#14771) to stable33#14814
skjnldsv merged 10 commits into
stable33from
copilot/backport-14769-and-add-14771

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented May 12, 2026

Backport of #14769 and #14771 to stable33, plus security dependency bumps and merge conflict resolution.

☑️ Resolves

🖼️ Screenshots

No visual changes (CI/lint and dependency updates only).

From PR #14769:

  • New .github/workflows/sphinx-lint.yml — lightweight CI job running sphinx-lint on all three manuals
  • New .github/problem-matchers/sphinx-lint.json — inline PR annotations for sphinx-lint findings
  • requirements.txt: added sphinx-lint==1.0.2
  • Fixed pre-existing RST violations (missing final newlines, malformed hyperlinks, unbalanced inline literals, role markup errors)

From PR #14771:

  • Removed --disable trailing-whitespace --disable horizontal-tab flags → full lint enforcement
  • Fixed all trailing-whitespace and horizontal-tab violations across all three manuals
  • Additional fixes for stable33-specific files not present in master

Security dependency bumps:

  • Pillow==12.1.012.2.0 (fixes OOB write with invalid PSD tile extents, FITS GZIP decompression bomb, OOB write loading PSD images)
  • urllib3==2.6.32.7.0 (fixes decompression-bomb safeguard bypass, sensitive headers forwarded across origins in proxied redirects)

Conflict resolution:

  • Files deleted in stable33 removed from branch
  • Content conflicts resolved using stable33 version with whitespace fixes applied
  • Merged latest stable33 update (config_sample_php_parameters.rst regeneration) with whitespace fixes re-applied

sphinx-lint admin_manual developer_manual user_manualNo problems found

Copilot AI and others added 8 commits May 12, 2026 07:46
- Add sphinx-lint==1.0.2 to requirements.txt
- Create .github/workflows/sphinx-lint.yml (disabling trailing-whitespace and horizontal-tab which have thousands of pre-existing violations)
- Fix 38 pre-existing RST violations across all three manuals:
  - 27 files missing final newline
  - Malformed hyperlinks (missing space, missing underscore)
  - Unbalanced inline literal delimiters
  - Role markup errors (missing backticks, missing colons)
  - Dangling hyphen in URL (converted to inline hyperlink)

Agent-Logs-Url: https://github.com/nextcloud/documentation/sessions/13a4f646-2926-4695-8df9-87521fbb2383

Co-authored-by: skjnldsv <14975046+skjnldsv@users.noreply.github.com>
…t dual-install intent

Agent-Logs-Url: https://github.com/nextcloud/documentation/sessions/c8666b05-c4aa-478f-a667-a8619d24faae

Co-authored-by: skjnldsv <14975046+skjnldsv@users.noreply.github.com>
Removed specific linting rules to simplify sphinx-lint command.

Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
Co-authored-by: skjnldsv <14975046+skjnldsv@users.noreply.github.com>
Co-authored-by: skjnldsv <14975046+skjnldsv@users.noreply.github.com>
Copilot AI requested a review from skjnldsv May 12, 2026 07:58
@skjnldsv skjnldsv changed the base branch from master to stable33 May 12, 2026 07:59
…ty vulnerabilities

Agent-Logs-Url: https://github.com/nextcloud/documentation/sessions/88e127f7-7717-426f-8e3f-aa500cf40898

Co-authored-by: skjnldsv <14975046+skjnldsv@users.noreply.github.com>
@skjnldsv skjnldsv force-pushed the copilot/backport-14769-and-add-14771 branch from 8616781 to 3a92747 Compare May 12, 2026 08:01
@skjnldsv skjnldsv marked this pull request as ready for review May 12, 2026 08:03
@skjnldsv skjnldsv changed the title backport: Add sphinx-lint CI + fix all RST violations (PR#14769 + PR#14771) to stable33 [stable33] backport: Add sphinx-lint CI + fix all RST violations (PR#14769 + PR#14771) to stable33 May 12, 2026
@skjnldsv skjnldsv requested a review from miaulalala May 12, 2026 08:11
Copy link
Copy Markdown
Contributor

@Antreesy Antreesy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, cherry-pick seems to be complete

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 12, 2026

@skjnldsv skjnldsv enabled auto-merge May 12, 2026 08:19
@skjnldsv skjnldsv disabled auto-merge May 12, 2026 08:19
@skjnldsv
Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

…14769-and-add-14771

Co-authored-by: skjnldsv <14975046+skjnldsv@users.noreply.github.com>
Copy link
Copy Markdown
Contributor Author

Copilot AI commented May 12, 2026

@copilot resolve the merge conflicts in this pull request

Resolved in commit 2d14b0c. The conflict was in admin_manual/configuration_server/config_sample_php_parameters.rst — stable33 had just had a regenerated version of that file pushed (4913d68), which conflicted with our trailing-whitespace fixes. Merged stable33 into the branch taking the regenerated version and applying the same whitespace cleanup on top. sphinx-lint still passes cleanly.

@skjnldsv skjnldsv enabled auto-merge May 12, 2026 09:16
@skjnldsv skjnldsv merged commit 4160602 into stable33 May 12, 2026
21 checks passed
@skjnldsv skjnldsv deleted the copilot/backport-14769-and-add-14771 branch May 12, 2026 09:35
@nickvergessen nickvergessen removed their request for review May 12, 2026 09:55
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.

3 participants