Skip to content

Fixing github action workflows (backport #1428)#1938

Merged
chatton merged 3 commits intorelease/v3.1.xfrom
mergify/bp/release/v3.1.x/pr-1428
Aug 10, 2022
Merged

Fixing github action workflows (backport #1428)#1938
chatton merged 3 commits intorelease/v3.1.xfrom
mergify/bp/release/v3.1.x/pr-1428

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 9, 2022

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

On branch mergify/bp/release/v3.1.x/pr-1428
Your branch is up to date with 'origin/release/v3.1.x'.

You are currently cherry-picking commit ba8c872.
  (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/check-docs.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/codeql-analysis.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

chatton added 2 commits August 9, 2022 09:50
(cherry picked from commit ba8c872)

# Conflicts:
#	.github/workflows/codeql-analysis.yml
@chatton chatton merged commit 586ec95 into release/v3.1.x Aug 10, 2022
@chatton chatton deleted the mergify/bp/release/v3.1.x/pr-1428 branch August 10, 2022 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants