Skip to content

fix: proto makefile does not work on windows #52

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

Merged
robot9706 merged 2 commits into from
Jul 28, 2022
Merged

fix: proto makefile does not work on windows #52

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c37d5c3
fix: proto makefile does not work on windows
robot9706 Jul 28, 2022
6742d8d
fix: removed install-tools
robot9706 Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ protogen:| proto-agent proto-crux proto-crux-ui
## Generate agent grpc files
.PHONY: proto-agent
proto-agent:
docker run --rm -u ${UID}:${GID} -v ${PWD}:/usr/work ghcr.io/dyrector-io/dyrectorio/alpine-proto:3.16 ash -c "\
MSYS_NO_PATHCONV=1 docker run --rm -u ${UID}:${GID} -v "${PWD}":/usr/work ghcr.io/dyrector-io/dyrectorio/alpine-proto:3.16 ash -c "\
mkdir -p protobuf/go && \
protoc -I. \
--go_out protobuf/go \
Expand All @@ -29,7 +29,7 @@ proto-agent:
# Generate API grpc files
.PHONY: proto-crux
proto-crux:
docker run --rm -u ${UID}:${GID} -v ${PWD}:/usr/work ghcr.io/dyrector-io/dyrectorio/alpine-proto:3.16 ash -c "\
MSYS_NO_PATHCONV=1 docker run -u ${UID}:${GID} -v "${PWD}":/usr/work ghcr.io/dyrector-io/dyrectorio/alpine-proto:3.16 ash -c "\
mkdir -p ./web/crux/src/grpc && \
protoc -I. \
--experimental_allow_proto3_optional \
Expand All @@ -41,13 +41,13 @@ proto-crux:
--ts_proto_out=./web/crux/src/grpc \
protobuf/proto/*.proto && \
cp -r protobuf/proto web/crux/" && \
cd ./web/crux && \
npx prettier -w "./src/grpc/**/*.ts"
cd ./web/crux && \
npx prettier -w "./src/grpc/**/*.ts"

# Generate UI grpc files, note the single file
.PHONY: proto-crux-ui
proto-crux-ui:
docker run --rm -u ${UID}:${GID} -v ${PWD}:/usr/work ghcr.io/dyrector-io/dyrectorio/alpine-proto:3.16 ash -c "\
MSYS_NO_PATHCONV=1 docker run --rm -u ${UID}:${GID} -v "${PWD}":/usr/work ghcr.io/dyrector-io/dyrectorio/alpine-proto:3.16 ash -c "\
mkdir -p ./web/crux-ui/src/models/grpc && \
protoc -I. \
--experimental_allow_proto3_optional \
Expand Down