From d1701b30357b20e8cc67e727652cbbf436a0c335 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 9 Mar 2021 08:40:35 +0100 Subject: [PATCH] conditionally include bingo --- Makefile | 2 ++ accounts/Makefile | 2 ++ glauth/Makefile | 2 ++ graph-explorer/Makefile | 2 ++ graph/Makefile | 2 ++ idp/Makefile | 2 ++ ocis-pkg/Makefile | 2 ++ ocis/Makefile | 2 ++ ocs/Makefile | 2 ++ onlyoffice/Makefile | 2 ++ proxy/Makefile | 2 ++ settings/Makefile | 4 ++++ storage/Makefile | 2 ++ store/Makefile | 2 ++ thumbnails/Makefile | 2 ++ web/Makefile | 2 ++ webdav/Makefile | 2 ++ 17 files changed, 36 insertions(+) diff --git a/Makefile b/Makefile index 2c7e45644..a8ce33309 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,9 @@ OCIS_MODULES = \ web \ webdav +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include .bingo/Variables.mk +endif .PHONY: help help: diff --git a/accounts/Makefile b/accounts/Makefile index 5b3fb2b38..668390553 100644 --- a/accounts/Makefile +++ b/accounts/Makefile @@ -7,7 +7,9 @@ test-acceptance-webui: ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/glauth/Makefile b/glauth/Makefile index 0b35cdf62..f5f731ad3 100644 --- a/glauth/Makefile +++ b/glauth/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := glauth ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile index a87ef3f85..ec7460f49 100644 --- a/graph-explorer/Makefile +++ b/graph-explorer/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := graph-explorer ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/graph/Makefile b/graph/Makefile index 36c385417..4c654b605 100644 --- a/graph/Makefile +++ b/graph/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := graph ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/idp/Makefile b/idp/Makefile index 2976dbaa4..25439c40e 100644 --- a/idp/Makefile +++ b/idp/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := idp ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/ocis-pkg/Makefile b/ocis-pkg/Makefile index a8f245469..db14059bb 100644 --- a/ocis-pkg/Makefile +++ b/ocis-pkg/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := ocis-pkg ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/ocis/Makefile b/ocis/Makefile index 191b6b680..219cf8228 100644 --- a/ocis/Makefile +++ b/ocis/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := ocis ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/ocs/Makefile b/ocs/Makefile index 0385be61e..6b8b74370 100644 --- a/ocs/Makefile +++ b/ocs/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := ocs ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/onlyoffice/Makefile b/onlyoffice/Makefile index e6fad654d..0c7d58ce9 100644 --- a/onlyoffice/Makefile +++ b/onlyoffice/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := onlyoffice ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/proxy/Makefile b/proxy/Makefile index 0a270a1b8..aaeb9677a 100644 --- a/proxy/Makefile +++ b/proxy/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := proxy ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/settings/Makefile b/settings/Makefile index 66fa9679b..838658496 100644 --- a/settings/Makefile +++ b/settings/Makefile @@ -7,11 +7,15 @@ test-acceptance-webui: ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk + + ############ release ############ include ../.make/release.mk diff --git a/storage/Makefile b/storage/Makefile index 25765dfe6..eb4222aa2 100644 --- a/storage/Makefile +++ b/storage/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := storage ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/store/Makefile b/store/Makefile index 8376e26b6..c201499b3 100644 --- a/store/Makefile +++ b/store/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := store ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/thumbnails/Makefile b/thumbnails/Makefile index e2fcecc7a..80e2c7c40 100644 --- a/thumbnails/Makefile +++ b/thumbnails/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := thumbnails ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/web/Makefile b/web/Makefile index f66136a85..b7f672484 100644 --- a/web/Makefile +++ b/web/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := web ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk diff --git a/webdav/Makefile b/webdav/Makefile index f4ab23837..1b85dfaf1 100644 --- a/webdav/Makefile +++ b/webdav/Makefile @@ -2,7 +2,9 @@ SHELL := bash NAME := webdav ############ tooling ############ +ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk +endif ############ go tooling ############ include ../.make/go.mk