prevent multiple yarn builds of accounts and settings when running `m…

…ake ci-node-generate` int the repo root
owncloud · Nov 16, 2021 · 74e7344 · 74e7344
1 parent c397a98
commit 74e7344
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 8 deletions.
diff --git a/.make/recursion.mk b/.make/recursion.mk
@@ -0,0 +1,8 @@
+
+ifeq ($(MAKE_DEPTH),)
+MAKE_DEPTH := 0
+else
+$(eval MAKE_DEPTH := $(shell echo "$$(( $(MAKE_DEPTH) + 1 ))" ) )
+endif
+
+export
diff --git a/Makefile b/Makefile
@@ -43,6 +43,8 @@ ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings`
 include .bingo/Variables.mk
 endif
 
+include .make/recursion.mk
+
 .PHONY: help
 help:
 	@echo "Please use 'make <target>' where <target> is one of the following:"
@@ -130,9 +132,10 @@ ci-go-generate:
 
 .PHONY: ci-node-generate
 ci-node-generate:
-	@for mod in $(OCIS_MODULES); do \
+	@if [ $(MAKE_DEPTH) -le 1 ]; then \
+	for mod in $(OCIS_MODULES); do \
         $(MAKE) --no-print-directory -C $$mod ci-node-generate; \
-    done
+    done; fi;
 
 .PHONY: go-mod-tidy
 go-mod-tidy:

diff --git a/accounts/Makefile b/accounts/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := accounts
 
+include ../.make/recursion.mk
+
 .PHONY: test-acceptance-webui
 test-acceptance-webui:
 	./ui/tests/run-acceptance-test.sh $(FEATURE_PATH)

diff --git a/glauth/Makefile b/glauth/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := glauth
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := graph-explorer
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

diff --git a/graph/Makefile b/graph/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := graph
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

diff --git a/idp/Makefile b/idp/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := idp
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

diff --git a/idp/package.json b/idp/package.json
@@ -150,5 +150,6 @@
     "webpack-manifest-plugin": "3.1.0",
     "workbox-webpack-plugin": "4.3.1",
     "yarn-deduplicate": "^3.1.0"
-  }
+  },
+  "packageManager": "[email protected]"
 }
diff --git a/ocis-pkg/Makefile b/ocis-pkg/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := ocis-pkg
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

diff --git a/ocis/Makefile b/ocis/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := ocis
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk
@@ -31,8 +33,7 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target
 	@go generate ./...
 
 .PHONY: ci-node-generate
-ci-node-generate: # no need to recreate go code, just add assets
-	@make -C ../accounts ci-node-generate
-	@make -C ../graph-explorer ci-node-generate
-	@make -C ../settings ci-node-generate
-	@make -C ../web ci-node-generate
+ci-node-generate: # ocis needs assets of all other modules
+	@if [ $(MAKE_DEPTH) -le 1 ]; then \
+	$(MAKE) --no-print-directory -C .. ci-node-generate \
+	; fi;
diff --git a/ocs/Makefile b/ocs/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := ocs
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

diff --git a/proxy/Makefile b/proxy/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := proxy
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

diff --git a/settings/Makefile b/settings/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := settings
 
+include ../.make/recursion.mk
+
 .PHONY: test-acceptance-webui
 test-acceptance-webui:
 	./ui/tests/run-acceptance-test.sh $(FEATURE_PATH)

diff --git a/storage/Makefile b/storage/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := storage
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

diff --git a/store/Makefile b/store/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := store
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

diff --git a/thumbnails/Makefile b/thumbnails/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := thumbnails
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

diff --git a/web/Makefile b/web/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := web
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

diff --git a/webdav/Makefile b/webdav/Makefile
@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := webdav
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk