Skip to content

Commit

Permalink
Merge branch 'protochanges' of github.com:tritonuas/gcs into protocha…
Browse files Browse the repository at this point in the history
…nges
  • Loading branch information
Tyler-Lentz committed Nov 23, 2023
2 parents a318f8f + ae1c93e commit b21f13d
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ install-assets:

# Build
# --------------------------------------------------------------------
.PHONY: pre-build build install-dependencies configure-git build-go build-react build-docker
.PHONY: pre-build build install-dependencies configure-git build-go build-react build-docker build-protos build-typescript-protos
pre-build: configure-git

build: build-go build-react
build: build-go build-react build-protos

configure-git:
git config --global url."[email protected]:".insteadOf "https://github.com/"
Expand All @@ -42,9 +42,20 @@ build-go:
build-react:
npm run --prefix ./houston build

build-docker: build-react
build-docker: build-react build-protos
DOCKER_BUILDKIT=1 docker build -t tritonuas/gcs -f build/package/Dockerfile .

build-protos: internal/protos/frontendConnection.pb.go

internal/protos/frontendConnection.pb.go: protos/frontendConnection.proto
protoc -I=./protos/ --go_out=./internal/protos/ --go_opt=paths=source_relative ./protos/frontendConnection.proto

build-typescript-protos: houston/src/protos

houston/src/protos: protos/frontendConnection.proto
protoc --plugin=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=./source_relative ./frontendConnection.proto


# Run
# --------------------------------------------------------------------
.PHONY: run run-docker run-compose stop-compose run-broach-compose develop
Expand Down

0 comments on commit b21f13d

Please sign in to comment.