Skip to content

Docs: Update Sphinx theme to v1x#802

Closed
lauranovich wants to merge 2 commits intoscylladb:masterfrom
lauranovich:add-theme-v1
Closed

Docs: Update Sphinx theme to v1x#802
lauranovich wants to merge 2 commits intoscylladb:masterfrom
lauranovich:add-theme-v1

Conversation

@lauranovich
Copy link
Copy Markdown
Contributor

Upgrades the Scylla Theme to v1.x
This change does not include any HP fixes or any other issues which will be handled with additional PRs. Please merge this FIRST.

Description of your changes:

Which issue is resolved by this Pull Request:
Resolves #

Upgrades the Scylla Theme to v1.x
This change does not include any HP fixes or any other issues which will be handled with additional PRs. Please merge this FIRST.
@lauranovich lauranovich added the kind/documentation Categorizes issue or PR as related to documentation. label Oct 6, 2021
Upgrades the Scylla Theme to v1.x
This change does not include any HP fixes or any other issues which will be handled with additional PRs. Please merge this FIRST.
@lauranovich
Copy link
Copy Markdown
Contributor Author

@dgarcia360 please take a look - the build has an error - works locally

@lauranovich lauranovich modified the milestones: v1.5, v1.6 Oct 6, 2021
@lauranovich
Copy link
Copy Markdown
Contributor Author

The following error has been noted

/home/lauranovich/github-repo/laura-operator/docs/source/migration.md: WARNING: document isn't included in any toctree
/home/lauranovich/github-repo/laura-operator/docs/source/nodeoperations/automatic_cleanup.md: WARNING: document isn't included in any toctree
/home/lauranovich/github-repo/laura-operator/docs/source/nodeoperations/maintenance_mode.md: WARNING: document isn't included in any toctree
/home/lauranovich/github-repo/laura-operator/docs/source/nodeoperations/replace_node.md: WARNING: document isn't included in any toctree
/home/lauranovich/github-repo/laura-operator/docs/source/nodeoperations/restore.md: WARNING: document isn't included in any toctree
/home/lauranovich/github-repo/laura-operator/docs/source/nodeoperations/scylla_upgrade.md: WARNING: document isn't included in any toctree

@tzach
Copy link
Copy Markdown
Contributor

tzach commented Oct 6, 2021

@lauranovich are these warning a regression ?

@lauranovich
Copy link
Copy Markdown
Contributor Author

@tzach they were there before - it wasn't caused by the upgrade

@lauranovich
Copy link
Copy Markdown
Contributor Author

The error is fixed in this PR -> #804

Copy link
Copy Markdown
Contributor

@tzach tzach left a comment

Choose a reason for hiding this comment

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

LGTM

@dgarcia360
Copy link
Copy Markdown
Contributor

Looks good to me. Since the repo is open-source, we could also enable the "Edit on GitHub" button.

@lauranovich
Copy link
Copy Markdown
Contributor Author

In the next PR I'll make those changes

@tnozicka tnozicka self-requested a review October 6, 2021 16:40
@tnozicka tnozicka added the priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. label Oct 6, 2021
@tnozicka tnozicka self-assigned this Oct 6, 2021
Copy link
Copy Markdown
Contributor

@tnozicka tnozicka left a comment

Choose a reason for hiding this comment

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

thanks for bumping our sphinx theme! a few technical comments on the machinery

push:
branches:
- master
- master
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

let's be consistent an not change the spacing, we use yaml arrays without extra indentation when user written (applies globally)

- master
paths:
- 'docs/**'
- "docs/**"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

probably a not needed diff

run: ./docs/_utils/deploy.sh
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} No newline at end of file
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

\n is missing

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
release:
name: Release docs
name: Build
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

given one of the steps actually deploys the docs and the job ID is "release", naming it "Build" seems a bit confusing

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
name: Build
name: Release

run: |
export PATH=$PATH:~/.local/bin
cd docs
make test No newline at end of file
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

make -C docs test

Comment thread docs/Makefile
ALLSPHINXOPTS := -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCEDIR)
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS := $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCEDIR)
TESTSPHINXOPTS = $(ALLSPHINXOPTS) -W --keep-going
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

:= for immediate evaluation

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
TESTSPHINXOPTS = $(ALLSPHINXOPTS) -W --keep-going
TESTSPHINXOPTS := $(ALLSPHINXOPTS) -W --keep-going

@tnozicka
Copy link
Copy Markdown
Contributor

tnozicka commented Oct 7, 2021

do we need the version suffixes in workflow's file names?

@tnozicka tnozicka requested a review from zimnx October 7, 2021 06:30
@tnozicka
Copy link
Copy Markdown
Contributor

tnozicka commented Oct 7, 2021

the new job failed (https://github.com/scylladb/scylla-operator/runs/3813890866?check_suite_focus=true#step:4:175) and needs to be fixed first.

(note to myself or @zimnx - we need to add that job as required when this lands)

@@ -0,0 +1,28 @@
name: "Build docs on pull requests"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

looking at the GH status contexts

Build docs on pull requests / Build (pull_request) Failing after 1m — Build
Go / Verify (pull_request) Successful in 3m

would it be nicer to name it Docs / Build ?

Copy link
Copy Markdown
Contributor

@dgarcia360 dgarcia360 Oct 7, 2021

Choose a reason for hiding this comment

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

Suggested change
name: "Build docs on pull requests"
name: "Docs / Build PR"

@@ -1,15 +1,14 @@
name: Release docs
name: "Publish docs to GitHub Pages"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
name: "Publish docs to GitHub Pages"
name: "Docs / Publish"

@dgarcia360
Copy link
Copy Markdown
Contributor

Many thanks @tnozicka @zimnx for the feedback!

We are going to add some of your suggestions to the Scylla Sphinx Theme repository.

do we need the version suffixes in workflow's file names?

We are adding these workflows to many projects. Versioning helps us know which version of the file each project is using.

@tzach
Copy link
Copy Markdown
Contributor

tzach commented Oct 20, 2021

@dgarcia360 what is the next step for this PR?

@dgarcia360
Copy link
Copy Markdown
Contributor

I've addressed the comments in #815, this PR can be closed.

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

Labels

kind/documentation Categorizes issue or PR as related to documentation. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants