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

Deploy docs to GitHub Pages (backport #739) #744

Merged
merged 2 commits into from
Jan 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 24, 2024

This is an automatic backport of pull request #739 done by Mergify.
Cherry-pick of 7e860cc has failed:

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

You are currently cherry-picking commit 7e860cc.
  (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:   docs/conf.py
	deleted:    tools/deploy_documentation.sh
	deleted:    tools/deploy_translatable_strings.sh
	deleted:    tools/github_poBranch_update_key.enc
	deleted:    tools/rclone.conf.enc
	modified:   tox.ini

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/deploy-docs.yml

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

* Deploy docs to GitHub Pages

* Fix conf.py copyrighht date

* gettext removed

(cherry picked from commit 7e860cc)

# Conflicts:
#	.github/workflows/deploy-docs.yml
@coveralls
Copy link

coveralls commented Jan 24, 2024

Pull Request Test Coverage Report for Build 7646768810

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 92.596%

Totals Coverage Status
Change from base Build 7453139336: 0.0%
Covered Lines: 1876
Relevant Lines: 2026

💛 - Coveralls

Fix it so it matches what is in main.
@woodsp-ibm
Copy link
Member

The deploy-docs file ended up with a conflict as part of this backport. Possibly due to #722 not being backported as that changed the file in main. Anyway I edited the file to remove the conflict section it noted and updated the owners so it matches overall now with the same file as is on main.

@mergify mergify bot merged commit ef0bad4 into stable/0.7 Jan 24, 2024
17 checks passed
@mergify mergify bot deleted the mergify/bp/stable/0.7/pr-739 branch January 24, 2024 22:16
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.

None yet

3 participants