-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #134 from tritonuas/fix/setup-deps-correctly
fix/setup deps correctly
- Loading branch information
Showing
1 changed file
with
12 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,12 +34,12 @@ install-fmter: | |
.PHONY: pre-build build configure-git build-go build-react build-docker build-protos build-backend-protos build-frontend-protos | ||
pre-build: configure-git | ||
|
||
build: build-go build-react build-protos | ||
build: build-go build-react | ||
|
||
configure-git: | ||
git config --global url."[email protected]:".insteadOf "https://github.com/" | ||
|
||
build-go: | ||
build-go: build-protos | ||
go build | ||
|
||
build-react: | ||
|
@@ -60,12 +60,19 @@ internal/protos/obc.pb.go: protos/obc.proto | |
|
||
build-frontend-protos: houston/src/protos/houston.pb.ts houston/src/protos/obc.pb.ts | ||
|
||
houston/src/protos/houston.pb.ts: protos/houston.proto | ||
houston/src/protos/houston.pb.ts: protos/houston.proto houston/node_modules/.bin/protoc-gen-ts_proto | ||
protoc --plugin=houston/node_modules/.bin/protoc-gen-ts_proto --ts_proto_opt=fileSuffix=.pb --ts_proto_out=./houston/src/ ./protos/houston.proto | ||
|
||
houston/src/protos/obc.pb.ts: protos/obc.proto | ||
protoc --plugin=houston/node_modules/.bin/protoc-gen-ts_proto --ts_proto_opt=fileSuffix=.pb --ts_proto_out=./houston/src/ ./protos/obc.proto | ||
|
||
protos/houston.proto: | ||
git submodule update --init --recursive | ||
|
||
protos/obc.proto: protos/houston.proto | ||
|
||
houston/node_modules/.bin/protoc-gen-ts_proto: | ||
cd houston && npm install | ||
|
||
# Run | ||
# -------------------------------------------------------------------- | ||
|
@@ -86,10 +93,10 @@ stop-compose: | |
docker compose -f deployments/docker-compose.yml down | ||
|
||
run-compose-mac: | ||
docker-compose -f deployments/docker-compose-mac.yml up -d | ||
docker compose -f deployments/docker-compose-mac.yml up -d | ||
|
||
stop-compose-mac: | ||
docker-compose -f deployments/docker-compose-mac.yml down | ||
docker compose -f deployments/docker-compose-mac.yml down | ||
|
||
run-broach-compose: | ||
docker compose -f deployments/broach-docker-compose.yml up -d | ||
|