Skip to content
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

Docs update to upstream hugo relearn 7.3.2 #6267

Conversation

bernhardkaindl
Copy link
Collaborator

@bernhardkaindl bernhardkaindl commented Feb 2, 2025

Thanks for the reviews and review comments!

The incremental change before the merge applied the required incremental fixes (see the Compare link of it).

  • Review comment from Pau applied: Reverted not running the required pull_request workflows.
  • Review comment from Pau applied: Fixed not even temporarily using private forks: Squashed commits
    • While squashing those changes, I:
      • Split change from menuTitle to linkTitle into an initial commit (can be done first)
      • Squashed the changes for doc/hugo.toml into one commit.
        • and extracted the change to hugo.toml into one commit (support current Hugo versions)
      • Squashed the changes for doc/README.md into one commit (no intermediate changes)
      • I found one inadvertent revert of a previous simplification: I removed this accidental revert.

Hugo docs: Fix upstream Hugo compatibility:

Update Hugo version support to work with the current Hugo version

This PR fixes using the Ubuntu snap to render the Hugo docs.

Relearn 7.x completely REMOVED the header.html and footer.html partials
Partials that useed them are:

Changes:

  • Hugo Relearn 6.x uses the linkTitle front matter option now:
    Quote from the release notes: The front matter option menuTitle deprecated in 5.24.0 was removed in favour for Hugo’s linkTitle.
  • Newer versions of Hugo require the option unsafe = true to include raw HTML.
  • Two Hugo Relearn 6.x partials need fixes for newer versions of Hugo.

Update doc/README.md accordingly

  • Update the information on supported versions.
  • Add information on the breaking changes in Hugo Relearn 7.x.x to watch out for.
  • While at it, fix/improve the formatting of doc/README.md:
    • Spelling fixes/improvements
    • Fix markdown linting errors (empty lines for spacing, no bare links)
      • Tidy up the document structure

Copy link
Member

@robhoes robhoes left a comment

Choose a reason for hiding this comment

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

I've tried this and it appears to work. Thanks!

@robhoes
Copy link
Member

robhoes commented Feb 3, 2025

But why are the 11 checks not running?

doc/go.mod Outdated Show resolved Hide resolved
@psafont
Copy link
Member

psafont commented Feb 3, 2025

But why are the 11 checks not running?

Because we merged a change that disabled them if the related content wasn't changed. But they are required in order to be able to merge. Unfortunately these cannot be configured to be required depending on the changed content.

@bernhardkaindl please revert the changes to disable the runs, theya re needed in roder to make the merge queue to work

…not need to run"

This partially reverts commit 3a6a64e.

Cause: Even when only Hugo docs change in a PR, the merge criteria
still requires all CI jobs.

Thus, they can only be skipped from push (those run in the submitter's
repo and are not required), but not from the pull_request workflows,
as those are required.

Signed-off-by: Bernhard Kaindl <[email protected]>
@bernhardkaindl bernhardkaindl force-pushed the docs-update-to-upstream-Hugo-Relearn-7.3.2 branch from e92341c to 7f64d07 Compare February 3, 2025 11:42
Copy link
Collaborator Author

@bernhardkaindl bernhardkaindl left a comment

Choose a reason for hiding this comment

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

👍 to @psafont (thanks for the approval already), @robhoes:

Thanks for the reviews and review comments!


Summary of the incremental changes:

I applied the required fixes and re-organized the changes in cumulative commits.

The incremental change consists only of the required incremental fixes (see the Compare link of it above):
bernhardkaindl force-pushed the docs-update-to-upstream-Hugo-Relearn-7.3.2 branch from e92341c to 7f64d07 Compare

👍 Review comment from Pau applied: Reverted not running the required pull_request workflows ->workflows are fixed.
👍 Review comment from Pau applied: Fixed not even temporarily using private forks -> Squashed those commits.

  • While squashing those changes, I:
    • Split change from menuTitle to linkTitle into an initial commit (can be done first)
    • Squashed the changes for doc/hugo.toml into one commit.
      • and extracted the change to hugo.toml into one commit (support current Hugo versions)
    • Squashed the changes for doc/README.md into one commit (no intermediate changes)
    • I found one inadvertent revert of a previous simplification: I removed this accidental revert.

It is ready for review again.

@robhoes robhoes added this pull request to the merge queue Feb 3, 2025
Merged via the queue into xapi-project:master with commit 3183abf Feb 3, 2025
15 checks passed
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.

3 participants