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

Fix workflows for PRs (backport #135) #148

Merged
merged 6 commits into from
Aug 12, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 12, 2023

This is an automatic backport of pull request #135 done by Mergify.
Cherry-pick of 5dfd401 has failed:

On branch mergify/bp/humble/pr-135
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 5dfd401.
  (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:
	new file:   .github/workflows/sphinx-check-warnings-pr.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/reusable-sphinx-check-single-version.yml
	deleted by us:   .github/workflows/sphinx-check-links.yml
	deleted by us:   .github/workflows/sphinx-check-warnings.yml
	both modified:   .github/workflows/sphinx-make-page.yml
	both modified:   make_help_scripts/add_tmp_commits

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

* Bump python version

* Remove composite action but install dependencies manually

* Don't use multiversion for PR check

* Deactivate "Build & Deploy Page" for PRs

---------

Co-authored-by: Bence Magyar <[email protected]>
(cherry picked from commit 5dfd401)

# Conflicts:
#	.github/workflows/reusable-sphinx-check-single-version.yml
#	.github/workflows/sphinx-check-links.yml
#	.github/workflows/sphinx-check-warnings.yml
#	.github/workflows/sphinx-make-page.yml
#	make_help_scripts/add_tmp_commits
@mergify mergify bot added the conflicts label Aug 12, 2023
@mergify mergify bot mentioned this pull request Aug 12, 2023
@christophfroehlich christophfroehlich marked this pull request as draft August 12, 2023 06:53
@christophfroehlich christophfroehlich marked this pull request as ready for review August 12, 2023 09:21
@christophfroehlich christophfroehlich merged commit 23fee77 into humble Aug 12, 2023
3 of 4 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-135 branch August 12, 2023 09:22
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.

1 participant