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

Switch the reference documentation to Antora #30414

Closed
wants to merge 31 commits into from

Conversation

rwinch
Copy link
Member

@rwinch rwinch commented May 3, 2023

Migrate the asciidoc based reference documentation to Antora https://antora.org/. The new documentation site https://docs.spring.io/spring-framework/reference/ provides more structured content, an integrated search, a link to "edit this page", multiple versions with option to switch, a warning at the top of older versions, and more.

For more details on the Antora integration for Spring projects, see https://github.com/spring-io/antora-ui-spring. It is also the right place to report issues related to the user interface.

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged or decided on label May 3, 2023
@rstoyanchev rstoyanchev self-assigned this May 3, 2023
@rstoyanchev rstoyanchev added type: documentation A documentation task type: enhancement A general enhancement and removed status: waiting-for-triage An issue we've not yet triaged or decided on type: enhancement A general enhancement labels May 3, 2023
@rstoyanchev rstoyanchev added this to the 6.0.9 milestone May 3, 2023
@@ -0,0 +1,32 @@
name: Deploy Docs
on:
push:
Copy link
Contributor

Choose a reason for hiding this comment

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

I would suggest an allow-list of exact branches to consider, rather than branches-ignore.
Similarly, I would suggest restricting the tags to something like 'v[0-9]+.[0-9]+.[0-9]+'

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the feedback. I'm wondering if maintaining this list, or even ignoring gh-pages, is worth it given that the logic to decide if a workflow event is triggered is:

The following steps occur to trigger a workflow run:

  1. An event occurs on your repository. The event has an associated commit SHA and Git ref.

  2. GitHub searches the .github/workflows directory in your repository for workflow files that are present in the associated commit SHA or Git ref of the event.

  3. A workflow run is triggered for any workflows that have on: values that match the triggering event. Some events also require the workflow file to be present on the default branch of the repository in order to run.

Each workflow run will use the version of the workflow that is present in the associated commit SHA or Git ref of the event. When a workflow runs, GitHub sets the GITHUB_SHA (commit SHA) and GITHUB_REF (Git ref) environment variables in the runner environment. For more information, see "Variables."

I view the branches-ignore attribute as a redundancy since unless someone merges the workflow into a branch or tag that you want to exclude, the workflow will not be considered. Excluding gh-pages is fairly simple, but maintaining a list of tags and branches (or expression/s that does the same) to include seems unnecessary overhead given that the workflow file will not be present.

Is there a specific concern you have here?

Copy link
Contributor

Choose a reason for hiding this comment

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

I've merged the changes in for now. Let's take this as a follow-up if needed, depending on the outcome of the discussion.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok. No specific concern, just a habit I got.

I guess for the framework team it doesn't happen that often that a branch would be created in the original repository, although we do have a couple of leftover branches.
But I guess if such a branch was created (e.g. for an experiment) it would have the file unless if it is an orphan branch (like docs-build).

There's the if: github.repository_owner check lower in the jobs which should broadly prevent any abuse from forks, so this should be fine from that perspective.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: documentation A documentation task
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants