From 8df626961cea768a06cec9b730c95674f7130cf5 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 1 Apr 2022 15:40:02 +0200 Subject: [PATCH] fail in for loops in the main makefile --- .bingo/Variables.mk | 1 + .bingo/variables.env | 1 + Makefile | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index f442f5340b..5807bf9f12 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -100,3 +100,4 @@ $(REFLEX): $(BINGO_DIR)/reflex.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/reflex-v0.3.1" @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=reflex.mod -o=$(GOBIN)/reflex-v0.3.1 "github.com/cespare/reflex" + diff --git a/.bingo/variables.env b/.bingo/variables.env index 1deb407f41..19edcff1c7 100644 --- a/.bingo/variables.env +++ b/.bingo/variables.env @@ -35,3 +35,4 @@ PROTOC_GEN_MICROWEB="${GOBIN}/protoc-gen-microweb-v0.0.0-20211219183901-997c02ca PROTOC_GEN_OPENAPIV2="${GOBIN}/protoc-gen-openapiv2-v2.7.2" REFLEX="${GOBIN}/reflex-v0.3.1" + diff --git a/Makefile b/Makefile index 2bffcac211..86cc7103c4 100644 --- a/Makefile +++ b/Makefile @@ -111,63 +111,63 @@ composer.lock: composer.json .PHONY: generate generate: @for mod in $(OCIS_MODULES); do \ - $(MAKE) --no-print-directory -C $$mod generate; \ + $(MAKE) --no-print-directory -C $$mod generate || exit 1; \ done .PHONY: vet vet: @for mod in $(OCIS_MODULES); do \ - $(MAKE) --no-print-directory -C $$mod vet; \ + $(MAKE) --no-print-directory -C $$mod vet || exit 1; \ done .PHONY: clean clean: @for mod in $(OCIS_MODULES); do \ - $(MAKE) --no-print-directory -C $$mod clean; \ + $(MAKE) --no-print-directory -C $$mod clean || exit 1; \ done .PHONY: docs-generate docs-generate: @for mod in $(OCIS_MODULES); do \ - $(MAKE) --no-print-directory -C $$mod docs-generate; \ + $(MAKE) --no-print-directory -C $$mod docs-generate || exit 1; \ done .PHONY: ci-go-generate ci-go-generate: @for mod in $(OCIS_MODULES); do \ - $(MAKE) --no-print-directory -C $$mod ci-go-generate; \ + $(MAKE) --no-print-directory -C $$mod ci-go-generate || exit 1; \ done .PHONY: ci-node-generate ci-node-generate: @if [ $(MAKE_DEPTH) -le 1 ]; then \ for mod in $(OCIS_MODULES); do \ - $(MAKE) --no-print-directory -C $$mod ci-node-generate; \ + $(MAKE) --no-print-directory -C $$mod ci-node-generate || exit 1; \ done; fi; .PHONY: go-mod-tidy go-mod-tidy: @for mod in $(OCIS_MODULES); do \ - $(MAKE) --no-print-directory -C $$mod go-mod-tidy; \ + $(MAKE) --no-print-directory -C $$mod go-mod-tidy || exit 1; \ done .PHONY: test test: @for mod in $(OCIS_MODULES); do \ - $(MAKE) --no-print-directory -C $$mod test; \ + $(MAKE) --no-print-directory -C $$mod test || exit 1; \ done .PHONY: go-coverage go-coverage: @if [ ! -f coverage.out ]; then $(MAKE) test &>/dev/null; fi; @for mod in $(OCIS_MODULES); do \ - echo -n "% coverage $$mod: "; $(MAKE) --no-print-directory -C $$mod go-coverage; \ + echo -n "% coverage $$mod: "; $(MAKE) --no-print-directory -C $$mod go-coverage || exit 1; \ done .PHONY: protobuf protobuf: @for mod in $(OCIS_MODULES); do \ - echo -n "% protobuf $$mod: "; $(MAKE) --no-print-directory -C $$mod protobuf; \ + echo -n "% protobuf $$mod: "; $(MAKE) --no-print-directory -C $$mod protobuf || exit 1; \ done .PHONY: bingo-update @@ -186,31 +186,31 @@ endif .PHONY: l10n-push l10n-push: @for extension in $(L10N_MODULES); do \ - $(MAKE) -C $$extension l10n-push; \ + $(MAKE) -C $$extension l10n-push || exit 1; \ done .PHONY: l10n-pull l10n-pull: @for extension in $(L10N_MODULES); do \ - $(MAKE) -C $$extension l10n-pull; \ + $(MAKE) -C $$extension l10n-pull || exit 1; \ done .PHONY: l10n-clean l10n-clean: @for extension in $(L10N_MODULES); do \ - $(MAKE) -C $$extension l10n-clean; \ + $(MAKE) -C $$extension l10n-clean || exit 1; \ done .PHONY: l10n-read l10n-read: @for extension in $(L10N_MODULES); do \ - $(MAKE) -C $$extension l10n-read; \ + $(MAKE) -C $$extension l10n-read || exit 1; \ done .PHONY: l10n-write l10n-write: @for extension in $(L10N_MODULES); do \ - $(MAKE) -C $$extension l10n-write; \ + $(MAKE) -C $$extension l10n-write || exit 1; \ done .PHONY: ci-format