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

README: fix the slightly misleading doc #30

Merged
merged 1 commit into from
Oct 13, 2023
Merged

README: fix the slightly misleading doc #30

merged 1 commit into from
Oct 13, 2023

Conversation

rouming
Copy link
Contributor

@rouming rouming commented Oct 11, 2023

make proto command runs protocol generation based on the tools installed on your local machine, which is not what really expected, because tools can be outdated.

make calls a make proto from a container, so all tools are of the correct versions.

This patch changes make proto to just make in all docs.

CC: @deitch

`make proto` command runs protocol generation based on the tools
installed on your local machine, which is not what really expected,
because tools can be outdated.

`make` calls a `make proto` from a container, so all tools are of
the correct versions.

This patch changes `make proto` to just `make`.

Signed-off-by: Roman Penyaev <[email protected]>
@rouming rouming requested a review from eriknordmark as a code owner October 11, 2023 13:29
@rouming
Copy link
Contributor Author

rouming commented Oct 13, 2023

Ping @eriknordmark @deitch

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.

LGTM

@eriknordmark eriknordmark requested a review from deitch October 13, 2023 09:51
Copy link
Contributor

@deitch deitch left a comment

Choose a reason for hiding this comment

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

This doesn't fit what I see in the Makefile:

proto-container:
	docker build -f .devcontainer/Dockerfile -t eve-api-builder .
	docker run --rm -v $(PWD):/src -w /src -u $$(id -u) eve-api-builder make proto

proto-diagram:
	protodot -inc /usr/local/include -src ./proto/config/devconfig.proto -output devconfig -generated ./images
	dot ./images/devconfig.dot -Tpng -o ./images/devconfig.png
	dot ./images/devconfig.dot -Tsvg -o ./images/devconfig.svg
	echo generated ./images/devconfig.*

.PHONY: proto-api-% proto proto-container

proto: go python proto-diagram
	@echo Done building protobuf, you may want to vendor it into your packages, e.g. pkg/pillar.
	@echo See ./go/README.md for more information.

@rouming
Copy link
Contributor Author

rouming commented Oct 13, 2023

This doesn't fit what I see in the Makefile:

The 'proto-container' is the first goal, which is the default for the make, so when you call 'make' you invoke the 'make proto-container'.

@deitch
Copy link
Contributor

deitch commented Oct 13, 2023

Oh. Ok. It's a bit confusing. You're right about the flow.

@deitch
Copy link
Contributor

deitch commented Oct 13, 2023

No idea why it won't let me review again. I'll just merge.

@deitch deitch merged commit 363795a into lf-edge:main Oct 13, 2023
3 of 4 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.

3 participants