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.

Sign up for GitHub

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
merged 4 commits into from
Mar 6, 2024
Merged

Update eve api usb+can #3786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7724bf2
Makefile: add target to bump eve-api
christoph-zededa Mar 1, 2024
65d5499
pkg: make bump-eve-api result
christoph-zededa Mar 1, 2024
655bb45
newlog: update pillar dependency
christoph-zededa Mar 1, 2024
9d6baf9
newlog: go mod tidy && go mod vendor
christoph-zededa Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

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 \;

.PHONY: proto-api-%

check-patch-%:
Expand Down Expand Up @@ -1017,6 +1020,9 @@ help:
@echo " shell drop into docker container setup for Go development"
@echo " yetus run Apache Yetus to check the quality of the source tree"
@echo
@echo "Seldom used maintenance and development targets:"
@echo " bump-eve-api bump eve-api in all subprojects"
@echo
@echo "Commonly used build targets:"
@echo " build-tools builds linuxkit utilities and installs under build-tools/bin"
@echo " config builds a bundle with initial EVE configs"
Expand Down
2 changes: 1 addition & 1 deletion pkg/edgeview/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/coreos/go-semver v0.3.1
github.com/gorilla/websocket v1.4.2
github.com/grandcat/zeroconf v1.0.0
github.com/lf-edge/eve-api/go v0.0.0-20240223172542-a95e144d46a9
github.com/lf-edge/eve-api/go v0.0.0-20240229195728-6180247abbc1
github.com/lf-edge/eve/pkg/pillar v0.0.0-20231025120317-b25d016a16bb
github.com/satori/go.uuid v1.2.1-0.20180404165556-75cca531ea76
github.com/shirou/gopsutil v3.21.11+incompatible
Expand Down
4 changes: 2 additions & 2 deletions pkg/edgeview/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/lf-edge/eve-api/go v0.0.0-20240223172542-a95e144d46a9 h1:MXZtUZ1hVvI7tG8v/cT/WzqCpmFzBueHNjDWZ2jDGL0=
github.com/lf-edge/eve-api/go v0.0.0-20240223172542-a95e144d46a9/go.mod h1:6XqpOM8p1HsluNIGw2ihYPYsaAisQ5CuJpbIKHXQo5w=
github.com/lf-edge/eve-api/go v0.0.0-20240229195728-6180247abbc1 h1:zLZ778WcW/abHulmCZREEQllcJFFk4A748lDFt962Rc=
github.com/lf-edge/eve-api/go v0.0.0-20240229195728-6180247abbc1/go.mod h1:6XqpOM8p1HsluNIGw2ihYPYsaAisQ5CuJpbIKHXQo5w=
github.com/lf-edge/eve/pkg/pillar v0.0.0-20231025120317-b25d016a16bb h1:pbvujlQLA66epNvCGgf4eRSdUTKvYPwU7fzOAltP/9o=
github.com/lf-edge/eve/pkg/pillar v0.0.0-20231025120317-b25d016a16bb/go.mod h1:YuUrK7yQdrSGH3D7auTDYNRgcBGBKGzbcVL5mY4IzrY=
github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
Expand Down
106 changes: 57 additions & 49 deletions pkg/edgeview/vendor/github.com/lf-edge/eve-api/go/evecommon/devmodelcommon.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/edgeview/vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ github.com/gorilla/websocket
# github.com/grandcat/zeroconf v1.0.0
## explicit; go 1.13
github.com/grandcat/zeroconf
# github.com/lf-edge/eve-api/go v0.0.0-20240223172542-a95e144d46a9
# github.com/lf-edge/eve-api/go v0.0.0-20240229195728-6180247abbc1
## explicit; go 1.20
github.com/lf-edge/eve-api/go/auth
github.com/lf-edge/eve-api/go/certs
Expand Down
30 changes: 20 additions & 10 deletions pkg/newlog/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,33 @@ go 1.20

require (
github.com/euank/go-kmsg-parser v2.0.0+incompatible
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.9
github.com/lf-edge/eve-api/go v0.0.0-20230727134029-123abaf9479d
github.com/lf-edge/eve/pkg/pillar v0.0.0-20230727061425-295cf5137a5c
github.com/sirupsen/logrus v1.9.0
github.com/golang/protobuf v1.5.3
github.com/google/go-cmp v0.6.0
github.com/lf-edge/eve-api/go v0.0.0-20240229195728-6180247abbc1
github.com/lf-edge/eve/pkg/pillar v0.0.0-20240229201048-a93b85069a10
github.com/sirupsen/logrus v1.9.3
)

require (
github.com/eriknordmark/ipinfo v0.0.0-20230728132417-2d8f4da903d7 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/google/go-containerregistry v0.8.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.15.5 // indirect
github.com/google/go-containerregistry v0.14.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/satori/go.uuid v1.2.1-0.20180404165556-75cca531ea76 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/vishvananda/netlink v1.1.1-0.20210924202909-187053b97868 // indirect
github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
golang.org/x/sys v0.5.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
golang.org/x/crypto v0.19.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Loading
Loading