Skip to content

Deploy docs to GitHub Pages (backport #1356)#1365

Merged
coruscating merged 6 commits into
stable/0.5from
mergify/bp/stable/0.5/pr-1356
Jan 25, 2024
Merged

Deploy docs to GitHub Pages (backport #1356)#1365
coruscating merged 6 commits into
stable/0.5from
mergify/bp/stable/0.5/pr-1356

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Jan 23, 2024

This is an automatic backport of pull request #1356 done by Mergify.
Cherry-pick of b605472 has failed:

On branch mergify/bp/stable/0.5/pr-1356
Your branch is up to date with 'origin/stable/0.5'.

You are currently cherry-picking commit b605472.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/docs_dev.yml
	renamed:    .github/workflows/docs.yml -> .github/workflows/docs_release.yml
	new file:   .github/workflows/docs_stable.yml
	deleted:    tools/rclone.conf.enc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   docs/conf.py
	deleted by them: tools/deploy_documentation.sh
	deleted by them: tools/deploy_documentation_dev.sh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

## Summary

This PR changes the `docs.yml` and `docs_dev.yml` workflows to deploy
the documentation to GitHub Pages to migrate the project away from the
qiskit.org domain.

More information about the change and a quick guide to set up GitHub
pages can be found at: Qiskit/ecosystem#578

Reminder task for maintainers to update the docs link in the About text
for the repo on the main page once this change happens and the docs are
re-deployed. This will need backporting to stable branches.

- [ ] Update About text doc link

## Details

The PR adds three new workflows, replacing the ones used to deploy to
qiskit.org (`docs.yml` and `docs_dev.yml`).

The new workflows replicate the same structure used by the old workflows
when the documentation was pushed to qiskit.org using the `rclone`
command. The documentation will be deployed into the `gh-pages` branch
where we will find the latest release in the root of the branch. In
addition, we will have one folder named `stable/` for all the previous
releases and a second one for the dev docs named `dev/`.

gh-pages branch structure example:
```
|- unversioned docs
|- stable/
    |- stable version1/
        |- stable docs
    |- stable version2/
	|- stable docs
|- dev/
	|- dev docs
```

The three new workflows are:

**docs_release.yml** (Docs Publish): This workflow allows us to deploy
the docs to GitHub pages into the root of the `gh-pages` branch. This
will be the unversioned release we will find on the website.

**docs_stable.yml** (Stable Docs Publish): This workflow deploys the
release we choose into the `stable/` folder. The documentation will be
accessible using the `Previous Releases` collapsible menu in the
sidebar.

**docs_dev.yml** (Dev Docs Publish): Same workflow as `docs_dev.yml` but
deploying the documentation to the `dev/` folder in the `gh-pages`
branch.

The `docs_release.yml` and the `docs_stable.yml` workflows split the
current `docs.yml` workflow into two phases. This change is useful to
have more control over what versions we want to deploy. With the old
workflow, we needed to deploy everything in a specific order to have the
latest version as the unversioned one on the website. With the two
workflows, we will be able to re-deploy stable versions when necessary.

---------

Co-authored-by: Helena Zhang <Helena.Zhang@ibm.com>
(cherry picked from commit b605472)

# Conflicts:
#	docs/conf.py
#	tools/deploy_documentation.sh
#	tools/deploy_documentation_dev.sh
@mergify mergify Bot added the conflicts label Jan 23, 2024
Copy link
Copy Markdown
Collaborator

@coruscating coruscating left a comment

Choose a reason for hiding this comment

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

This is a PR to deploy stable docs to github pages. There's no plan for another 0.5 release since 0.6 will be released soon. symengine was removed since it caused tests to fail.

@coruscating coruscating merged commit c8024cd into stable/0.5 Jan 25, 2024
@mergify mergify Bot deleted the mergify/bp/stable/0.5/pr-1356 branch January 25, 2024 02:41
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.

2 participants