Skip to content

Commit

Permalink
Merge pull request #134 from tritonuas/fix/setup-deps-correctly
Browse files Browse the repository at this point in the history
fix/setup deps correctly
  • Loading branch information
miyatakazuya authored Oct 18, 2024
2 parents fe25b1e + 7e37642 commit 8394b80
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
# --------------------------------------------------------------------
Expand All @@ -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
Expand Down

0 comments on commit 8394b80

Please sign in to comment.