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 protobuf files and go mod/sum #43

Merged
merged 4 commits into from
Feb 11, 2021

Conversation

kolyshkin
Copy link
Contributor

This is a followup to #38, addressing #36.

This updates stats/stats.pb.go and rpc/rpc.pb.go to versions generated by latest protoc-gen-go. This makes them compatible with github.com/golang/[email protected] as well as google.golang.org/protobuf/proto.

This also updates go.mod and go.sum, adding golang.org/x/sys/unix (used by phaul) and google.golang.org/protobuf (used by *.pb.go).

See more details in commit messages.

Brought to you by

	# (bring in latest protoc-gen-go)
	go get github.com/golang/protobuf/protoc-gen-go
	# (regen for github.com/golang/[email protected])
	make -B rpc/rpc.pb.go

This prepares the code to be switched to google.golang.org/protobuf/proto

Signed-off-by: Kir Kolyshkin <[email protected]>
Same as commit 654aa39 did for rpc/*.

Signed-off-by: Kir Kolyshkin <[email protected]>
This should prepare the code to switch to using
google.golang.org/protobuf/proto

Signed-off-by: Kir Kolyshkin <[email protected]>
Brought to you by

	cd phaul && go build .

This adds
 - golang.org/x/sys/unix because it is used by phaul;
 - google.golang.org/protobuf because it is used by *.pb.go stuff.

Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin
Copy link
Contributor Author

@adrianreber @rst0git PTAL

@adrianreber adrianreber merged commit 483ea88 into checkpoint-restore:master Feb 11, 2021
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Feb 12, 2021
Switch from github.com/golang/protobuf (which appears to be obsoleted)
to google.golang.org/protobuf (which appears to be a replacement).

This needs a bump of checkpoint-restore/go-criu to include
checkpoint-restore/go-criu#43.

Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Feb 13, 2021
Switch from github.com/golang/protobuf (which appears to be obsoleted)
to google.golang.org/protobuf (which appears to be a replacement).

This needs a bump of checkpoint-restore/go-criu to include
checkpoint-restore/go-criu#43.

Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Feb 13, 2021
Switch from github.com/golang/protobuf (which appears to be obsoleted)
to google.golang.org/protobuf (which appears to be a replacement).

This needs a bump of checkpoint-restore/go-criu to include
checkpoint-restore/go-criu#43.

[v2: fix debug print in criuSwrk]

Signed-off-by: Kir Kolyshkin <[email protected]>
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