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

Revert mock update #9131

Merged
merged 2 commits into from
Feb 2, 2024
Merged

Revert mock update #9131

merged 2 commits into from
Feb 2, 2024

Conversation

jenshu
Copy link
Contributor

@jenshu jenshu commented Feb 2, 2024

The merge from v2 branch brought in a dependency update from github.com/golang/mock to go.uber.org/mock. While we should probably update that dependency eventually (as the golang one is no longer maintained), this update currently causes test compilation issues when pulling into solo-projects, as all our other repos still use the golang mock. It will take some coordination to get the updates into all the other repos. For now just revert the update in gloo to avoid the conflicts.

Note: not including in changelog because there hasn't been a gloo release with the uber mock update so there should be no user facing change

@jenshu jenshu requested a review from a team as a code owner February 2, 2024 20:09
@github-actions github-actions bot added the keep pr updated signals bulldozer to keep pr up to date with base branch label Feb 2, 2024
@jenshu
Copy link
Contributor Author

jenshu commented Feb 2, 2024

/skip-changelog

Copy link
Contributor

@davidjumani davidjumani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had a quick look at the branch. No references to go.uber.org/mock found

Copy link

github-actions bot commented Feb 2, 2024

Visit the preview URL for this PR (updated for commit 29b007c):

https://gloo-edge--pr9131-revert-mock-update-zel5jpwd.web.app

(expires Fri, 09 Feb 2024 20:20:57 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

Sign: 77c2b86e287749579b7ff9cadb81e099042ef677

Copy link
Contributor

@sheidkamp sheidkamp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checked for go.uber.org/mock and successfully ran codegen.

@soloio-bulldozer soloio-bulldozer bot merged commit 85a8f3f into main Feb 2, 2024
18 checks passed
@soloio-bulldozer soloio-bulldozer bot deleted the revert-mock-update branch February 2, 2024 20:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
keep pr updated signals bulldozer to keep pr up to date with base branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants