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

🛠️ Bump pre-commit/action from 3.0.0 to 3.0.1 (backport #2677) #2678

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 8, 2024

This is an automatic backport of pull request #2677 done by Mergify.
Cherry-pick of 78d6e1f has failed:

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

You are currently cherry-picking commit 78d6e1fd4.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/format.yaml

no changes added to commit (use "git add" and/or "git commit -a")

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


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

Bumps [pre-commit/action](https://github.com/pre-commit/action) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/pre-commit/action/releases)
- [Commits](pre-commit/action@v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: pre-commit/action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 78d6e1f)

# Conflicts:
#	.github/workflows/format.yaml
@mergify mergify bot added the conflicts label Feb 8, 2024
Copy link

codecov bot commented Feb 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (7ce2fa9) 50.90% compared to head (f2cab81) 50.91%.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #2678      +/-   ##
==========================================
+ Coverage   50.90%   50.91%   +0.02%     
==========================================
  Files         382      382              
  Lines       31897    31897              
==========================================
+ Hits        16234    16238       +4     
+ Misses      15663    15659       -4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@tylerjw
Copy link
Member

tylerjw commented Feb 8, 2024

This needs to be fixed up, it has conflicts that should be easy to resolve.

@tylerjw tylerjw self-assigned this Feb 8, 2024
@tylerjw tylerjw closed this Feb 13, 2024
@mergify mergify bot deleted the mergify/bp/humble/pr-2677 branch February 13, 2024 22:54
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