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

[7.17](backport #38175) github-action: support check/lint/pre-commit #39797

Merged
merged 2 commits into from
Jun 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2024

Proposed commit message

Further actions

  • Update branch-protection:
    • Add pre-commit / pre-commit

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


This is an automatic backport of pull request #38175 done by [Mergify](https://mergify.com).

(cherry picked from commit bef2cc6)

# Conflicts:
#	.pre-commit-config.yaml
@mergify mergify bot added the backport label Jun 4, 2024
@mergify mergify bot requested a review from a team as a code owner June 4, 2024 17:51
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 4, 2024
@mergify mergify bot requested review from rdner and fearful-symmetry and removed request for a team June 4, 2024 17:51
@mergify mergify bot assigned v1v Jun 4, 2024
Copy link
Contributor Author

mergify bot commented Jun 4, 2024

Cherry-pick of bef2cc6 has failed:

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

You are currently cherry-picking commit bef2cc6beb.
  (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/pre-commit.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .pre-commit-config.yaml

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 4, 2024
@botelastic
Copy link

botelastic bot commented Jun 4, 2024

This pull request doesn't have a Team:<team> label.

.pre-commit-config.yaml Outdated Show resolved Hide resolved
@v1v v1v removed the conflicts There is a conflict in the backported pull request label Jun 4, 2024
Copy link
Contributor Author

mergify bot commented Jun 10, 2024

This pull request has not been merged yet. Could you please review and merge it @v1v? 🙏

@v1v v1v enabled auto-merge (squash) June 10, 2024 06:35
@v1v v1v merged commit b6f4a46 into 7.17 Jun 10, 2024
10 checks passed
@v1v v1v deleted the mergify/bp/7.17/pr-38175 branch June 10, 2024 06:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant