Skip to content

Commit

Permalink
move make proto & make proto-lint commands to root folder (ark-ne…
Browse files Browse the repository at this point in the history
…twork#265)

* fix make proto

* cleaning
  • Loading branch information
louisinger authored Aug 16, 2024
1 parent 6e7fff9 commit 7c31942
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 23 deletions.
12 changes: 11 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: build-server build-client build-all-server build-all-client
.PHONY: build-server build-client build-all-server build-all-client proto proto-lint build build-all

build-server:
@echo "Building arkd binary..."
Expand All @@ -22,3 +22,13 @@ build-wasm:

build: build-server build-client build-wasm
build-all: build-all-server build-all-client build-wasm

proto: proto-lint
@echo "Compiling stubs..."
@docker run --rm --volume "$(shell pwd):/workspace" --workdir /workspace buf generate buf.build/vulpemventures/ocean
@docker run --rm --volume "$(shell pwd):/workspace" --workdir /workspace buf generate

proto-lint:
@echo "Linting protos..."
@docker build -q -t buf -f buf.Dockerfile . &> /dev/null
@docker run --rm --volume "$(shell pwd):/workspace" --workdir /workspace buf lint
3 changes: 1 addition & 2 deletions api-spec/protobuf/gen/ark/v1/admin.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions api-spec/protobuf/gen/ark/v1/service.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions api-spec/protobuf/gen/ark/v1/wallet.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
15 changes: 1 addition & 14 deletions server/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: build clean cov help intergrationtest lint run run-neutrino run-neutrino-signet test vet proto proto-lint
.PHONY: build clean cov help intergrationtest lint run run-neutrino run-neutrino-signet test vet

## build: build for all platforms
build:
Expand Down Expand Up @@ -91,19 +91,6 @@ vet:
@echo "Running code analysis..."
@go vet ./...

## proto: compile proto stubs
proto: proto-lint
@echo "Compiling stubs..."
@docker run --rm --volume "$(shell pwd):/workspace" --workdir /workspace buf generate buf.build/vulpemventures/ocean
@docker run --rm --volume "$(shell pwd):/workspace" --workdir /workspace buf generate

## proto-lint: lint protos
proto-lint:
@echo "Linting protos..."
@docker build -q -t buf -f buf.Dockerfile . &> /dev/null
@docker run --rm --volume "$(shell pwd):/workspace" --workdir /workspace buf lint


## mig_file: creates pg migration file(eg. make FILE=init mig_file)
mig_file:
@migrate create -ext sql -dir ./internal/infrastructure/db/sqlite/migration/ $(FILE)
Expand Down

0 comments on commit 7c31942

Please sign in to comment.