Skip to content

build(deps): Mock generation no longer uses the latest tag on mockery. (backport #4605)#4608

Merged
alesforz merged 2 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-4605
Dec 4, 2024
Merged

build(deps): Mock generation no longer uses the latest tag on mockery. (backport #4605)#4608
alesforz merged 2 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-4605

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 4, 2024

Context

Using latest for mockery causes changes in the mocks with almost every new release, which in turn makes our CI fail. By fixing mockery's version, we can prevent this issue. Additionally, mockery's documentation suggests not to use latest anyway, so we were doing it incorrectly from the start.

Changes

This PR pins the mockery version to v2.49.2 (the latest release). The main branch already uses mocks generated with this version, so using any other version of mockery would alter the mocks again. At least we get the benefit from the latest bug fixes.


PR checklist

  • [ ] Tests written/updated
  • 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 #4605 done by [Mergify](https://mergify.com).

…ery`. (#4605)

### Context
Using `latest` for `mockery` causes changes in the mocks with almost
every new release, which in turn makes our CI fail. By fixing
`mockery`'s version, we can prevent this issue. Additionally,
`mockery`'s documentation suggests not to use `latest` anyway, so we
were doing it incorrectly from the start.

### Changes
This PR pins the `mockery` version to `v2.49.2` (the latest release).
The `main` branch already uses mocks generated with this version, so
using any other version of `mockery` would alter the mocks again. At
least we get the benefit from the latest bug fixes.

---

#### 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~

(cherry picked from commit 13d852b)

# Conflicts:
#	.changelog/v0.38.12/dependencies/4605-fix-mockery-version.md
@mergify mergify bot requested a review from a team as a code owner December 4, 2024 13:25
@mergify mergify bot added the conflicts label Dec 4, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Dec 4, 2024

Cherry-pick of 13d852b has failed:

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

You are currently cherry-picking commit 13d852b43.
  (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:   scripts/mockery_generate.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	added by them:   .changelog/v0.38.12/dependencies/4605-fix-mockery-version.md

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

@alesforz alesforz added dependencies Dependency updates chore and removed conflicts labels Dec 4, 2024
@alesforz alesforz merged commit 5c0dd99 into v0.38.x Dec 4, 2024
@alesforz alesforz deleted the mergify/bp/v0.38.x/pr-4605 branch December 4, 2024 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

chore dependencies Dependency updates

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

1 participant