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

pillar : update eve-api to latest version #4668

Merged
merged 1 commit into from
Mar 10, 2025

Conversation

shjala
Copy link
Member

@shjala shjala commented Mar 10, 2025

Rebasing #4602 to master will lead protobuf binary data conflict in eve-api. I'm not comfortable resolving/accepting binary data, I've updated my branch to the latest eve-api, this commit updates Pillar's eve-api to the latest too and gets rid of the conflict.

@shjala shjala requested a review from eriknordmark as a code owner March 10, 2025 10:02
@shjala shjala requested a review from OhmSpectator March 10, 2025 10:11
@@ -1456,6 +1456,8 @@ github.com/lf-edge/eve-api/go v0.0.0-20250227172635-d65ee400e16d h1:3GinRDoSMhMR
github.com/lf-edge/eve-api/go v0.0.0-20250227172635-d65ee400e16d/go.mod h1:ot6MhAhBXapUDl/hXklaX4kY88T3uC4PTg0D2wD8DzA=
github.com/lf-edge/eve-api/go v0.0.0-20250228142514-8c31fa62d594 h1:K9Vu2Mb69EBNnZYsZR3Y+X6fNvYHgj2ePl2vNzhepAs=
github.com/lf-edge/eve-api/go v0.0.0-20250228142514-8c31fa62d594/go.mod h1:ot6MhAhBXapUDl/hXklaX4kY88T3uC4PTg0D2wD8DzA=
github.com/lf-edge/eve-api/go v0.0.0-20250304184518-532c94981505 h1:J4pEkDOnO3o+MVSsL5Xr6lcO/fYApcALbVpfUONijp0=
Copy link
Contributor

Choose a reason for hiding this comment

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

Try running go mod tidy - it should remove the previous eve-api versions from go.sum

Update eve-api to the latest version.

Signed-off-by: Shahriyar Jalayeri <[email protected]>
Copy link
Contributor

@milan-zededa milan-zededa left a comment

Choose a reason for hiding this comment

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

Approve again to run tests

@milan-zededa milan-zededa merged commit cac6b86 into lf-edge:master Mar 10, 2025
43 of 44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants