From a23e648e17ab02b6457d4fa87d7709507840f2c0 Mon Sep 17 00:00:00 2001 From: jkoberg Date: Fri, 15 Oct 2021 16:22:47 +0200 Subject: [PATCH] do same for ocis --- graph-explorer/Makefile | 2 +- ocis/Makefile | 4 ++++ ocs/Makefile | 9 +-------- settings/Makefile | 4 ++-- web/Makefile | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile index e5ab1994f6..9c6cf2e178 100644 --- a/graph-explorer/Makefile +++ b/graph-explorer/Makefile @@ -23,7 +23,7 @@ include ../.make/generate.mk .PHONY: ci-go-generate ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this target - @go generate ./... + #@go generate ./... .PHONY: ci-node-generate ci-node-generate: diff --git a/ocis/Makefile b/ocis/Makefile index cec42f633d..b610e49fc4 100644 --- a/ocis/Makefile +++ b/ocis/Makefile @@ -32,3 +32,7 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target .PHONY: ci-node-generate ci-node-generate: + @make -C ../accounts generate + @make -C ../graph-explorer generate + @make -C ../settings generate + @make -C ../web generate diff --git a/ocs/Makefile b/ocs/Makefile index 1c8f4960cf..f1e17ccca2 100644 --- a/ocs/Makefile +++ b/ocs/Makefile @@ -26,12 +26,5 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target @go generate ./... .PHONY: ci-node-generate -ci-node-generate: yarn-build +ci-node-generate: @make -C ../accounts generate - -.PHONY: yarn-build -yarn-build: node_modules - -.PHONY: node_modules -node_modules: - yarn install --frozen-lockfile diff --git a/settings/Makefile b/settings/Makefile index 3889e4cb1a..16e9f8184d 100644 --- a/settings/Makefile +++ b/settings/Makefile @@ -32,8 +32,8 @@ docs-generate: config-docs-generate \ include ../.make/generate.mk .PHONY: ci-go-generate -ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target - @go generate ./... +ci-go-generate: #protobuf # CI runs ci-node-generate automatically before this target + #@go generate ./... .PHONY: ci-node-generate ci-node-generate: yarn-build diff --git a/web/Makefile b/web/Makefile index f9ea026e88..6f258a2e13 100644 --- a/web/Makefile +++ b/web/Makefile @@ -23,7 +23,7 @@ include ../.make/generate.mk .PHONY: ci-go-generate ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this target - @go generate ./... + #@go generate ./... .PHONY: ci-node-generate ci-node-generate: