Skip to content

feat(mocks): mockery v2.49.0 changes mock format (backport #4521)#4528

Merged
mergify[bot] merged 3 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-4521
Nov 25, 2024
Merged

feat(mocks): mockery v2.49.0 changes mock format (backport #4521)#4528
mergify[bot] merged 3 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-4521

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Nov 22, 2024

This PR generates new mocks because the version of mockery changes. Marking it as draft until all tests pass.

The resolution comes from vektra/mockery#848 .

We should think of a way to make our mocks compatible with the upcoming v3 release.


PR checklist

  • Tests written/updated
  • [x ] Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments

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

This PR generates new mocks because the version of mockery changes.
Marking it as draft until all tests pass.

The resolution comes from vektra/mockery#848 .

We should think of a way to make our mocks compatible with the upcoming
`v3` release.

---

#### PR checklist

- [ ] Tests written/updated
- [x ] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments

---------

Co-authored-by: Andy Nogueira <me@andynogueira.dev>
(cherry picked from commit cdab56d)

# Conflicts:
#	scripts/mockery_generate.sh
@mergify mergify bot requested a review from a team as a code owner November 22, 2024 13:49
@mergify mergify bot added the conflicts label Nov 22, 2024
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Nov 22, 2024

Cherry-pick of cdab56d has failed:

On branch mergify/bp/v0.34.x/pr-4521
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit cdab56d7d.
  (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:   .mockery.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   scripts/mockery_generate.sh

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 mergify bot merged commit 10c4532 into v0.34.x Nov 25, 2024
@mergify mergify bot deleted the mergify/bp/v0.34.x/pr-4521 branch November 25, 2024 05:02
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.

2 participants