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

Update eve api usb+can #3786

Merged

Conversation

christoph-zededa
Copy link
Contributor

to include lf-edge/eve-api#45

@milan-zededa
Copy link
Contributor

It seems that you forgot to update the vendor folders with these changes.

@christoph-zededa christoph-zededa force-pushed the update_eve_api_usb+can branch 4 times, most recently from e340dca to 558db2e Compare March 1, 2024 15:36
Copy link

codecov bot commented Mar 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 19.69%. Comparing base (a93b850) to head (9d6baf9).

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3786      +/-   ##
==========================================
- Coverage   19.71%   19.69%   -0.02%     
==========================================
  Files         235      235              
  Lines       51757    51757              
==========================================
- Hits        10204    10196       -8     
- Misses      40815    40821       +6     
- Partials      738      740       +2     

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

@christoph-zededa christoph-zededa force-pushed the update_eve_api_usb+can branch 5 times, most recently from ef7cf85 to 063dbb1 Compare March 1, 2024 16:41
Makefile Outdated
@@ -834,6 +834,11 @@ cache-export-docker-load-all: $(LINUXKIT) $(addsuffix -cache-export-docker-load,
proto-vendor:
@$(DOCKER_GO) "cd pkg/pillar ; go mod vendor" $(CURDIR) proto

bump-eve-api:
find . -type f -name "go.mod" -exec grep -q 'github.com/lf-edge/eve-api/go' {} \; -execdir go get -u github.com/lf-edge/eve-api/go \;
find . -type f -name "go.mod" -exec grep -q 'github.com/lf-edge/eve-api/go' {} \; -execdir go mod tidy \;
Copy link
Contributor

Choose a reason for hiding this comment

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

You don't need to execute 3x the find command and look 3x for all files, you can just pass multiple -execdir arguments, like this:

find . -type f -name "go.mod" -exec grep -q 'github.com/lf-edge/eve-api/go' {} \; -execdir go get -u github.com/lf-edge/eve-api/go \; -execdir go mod tidy \; -execdir go mod vendor \;

@christoph-zededa christoph-zededa force-pushed the update_eve_api_usb+can branch from 063dbb1 to 5e871a4 Compare March 1, 2024 17:27
@@ -834,6 +834,9 @@ cache-export-docker-load-all: $(LINUXKIT) $(addsuffix -cache-export-docker-load,
proto-vendor:
@$(DOCKER_GO) "cd pkg/pillar ; go mod vendor" $(CURDIR) proto

bump-eve-api:
Copy link
Contributor

Choose a reason for hiding this comment

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

@christoph-zededa , I forgot to mention that would be good to have this target explained in the make help target....

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done; please have a look at the help text

@christoph-zededa christoph-zededa force-pushed the update_eve_api_usb+can branch from 5e871a4 to bcfc94f Compare March 4, 2024 11:51
Signed-off-by: Christoph Ostarek <christoph@zededa.com>
Just autogenerated stuff after updating the eve-api and calling:

make bump-eve-api

Nothing to look at.

Signed-off-by: Christoph Ostarek <christoph@zededa.com>
Signed-off-by: Christoph Ostarek <christoph@zededa.com>
Signed-off-by: Christoph Ostarek <christoph@zededa.com>
@christoph-zededa christoph-zededa force-pushed the update_eve_api_usb+can branch from bcfc94f to 9d6baf9 Compare March 4, 2024 12:08
Copy link
Contributor

@rene rene left a comment

Choose a reason for hiding this comment

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

Thanks @christoph-zededa , LGTM.

Copy link
Contributor

@eriknordmark eriknordmark left a comment

Choose a reason for hiding this comment

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

Looks good

@eriknordmark eriknordmark merged commit a50198a into lf-edge:master Mar 6, 2024
34 of 46 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.

4 participants