From 2fc8b65d00b2a293601a7e69a5dc5eb52ba2fd2f Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 10 Nov 2020 09:18:26 +0000 Subject: [PATCH 1/3] Populate errorlevel from the top level Makefile --- Makefile | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index a45ea9da..975bf59d 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,24 @@ TARGETS=go1.10 go1.11 go1.12 go1.13 go1.14 build: + error=0 @$(foreach var,$(TARGETS), \ - $(MAKE) -C $(var) $@; \ - $(MAKE) -C $(var) -f Makefile.debian7 $@; \ - $(MAKE) -C $(var) -f Makefile.debian8 $@; \ - $(MAKE) -C $(var) -f Makefile.debian9 $@;) - @make -C fpm $@ + $(MAKE) -C $(var) $@ || error=1; \ + $(MAKE) -C $(var) -f Makefile.debian7 $@ || error=1; \ + $(MAKE) -C $(var) -f Makefile.debian8 $@ || error=1; \ + $(MAKE) -C $(var) -f Makefile.debian9 $@ || error=1;) + @make -C fpm $@ || error=1 + exit $(error) # Requires login at https://docker.elastic.co:7000/. push: + error=0 @$(foreach var,$(TARGETS), \ - $(MAKE) -C $(var) $@; \ - $(MAKE) -C $(var) -f Makefile.debian7 $@; \ - $(MAKE) -C $(var) -f Makefile.debian8 $@; \ - $(MAKE) -C $(var) -f Makefile.debian9 $@;) - @make -C fpm $@ + $(MAKE) -C $(var) $@ || error=1; \ + $(MAKE) -C $(var) -f Makefile.debian7 $@ || error=1; \ + $(MAKE) -C $(var) -f Makefile.debian8 $@ || error=1; \ + $(MAKE) -C $(var) -f Makefile.debian9 $@ || error=1;) + @make -C fpm $@ || error=1 + exit $(error) .PHONY: build push From 1eee7a2c8a42c26baa49ffa902e0948ac7578080 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 10 Nov 2020 10:06:05 +0000 Subject: [PATCH 2/3] Use flag file to report the errorlevel --- .gitignore | 1 + Makefile | 30 ++++++++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 6824cff3..8ce2fb22 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ .vagrant _obj Dockerfile +.status.* \ No newline at end of file diff --git a/Makefile b/Makefile index 975bf59d..ad846568 100644 --- a/Makefile +++ b/Makefile @@ -1,24 +1,26 @@ TARGETS=go1.10 go1.11 go1.12 go1.13 go1.14 +build: status=".status.build" build: - error=0 + @echo '0' > ${status} @$(foreach var,$(TARGETS), \ - $(MAKE) -C $(var) $@ || error=1; \ - $(MAKE) -C $(var) -f Makefile.debian7 $@ || error=1; \ - $(MAKE) -C $(var) -f Makefile.debian8 $@ || error=1; \ - $(MAKE) -C $(var) -f Makefile.debian9 $@ || error=1;) - @make -C fpm $@ || error=1 - exit $(error) + $(MAKE) -C $(var) $@ || echo '1' > ${status} ;\ + $(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status} ;\ + $(MAKE) -C $(var) -f Makefile.debian8 $@ || echo '1' > ${status} ;\ + $(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status}) + @make -C fpm $@ || echo '1' > ${status} + exit $$(cat ${status}) # Requires login at https://docker.elastic.co:7000/. +push: status=".status.push" push: - error=0 + @echo '0' > ${status} @$(foreach var,$(TARGETS), \ - $(MAKE) -C $(var) $@ || error=1; \ - $(MAKE) -C $(var) -f Makefile.debian7 $@ || error=1; \ - $(MAKE) -C $(var) -f Makefile.debian8 $@ || error=1; \ - $(MAKE) -C $(var) -f Makefile.debian9 $@ || error=1;) - @make -C fpm $@ || error=1 - exit $(error) + $(MAKE) -C $(var) $@ || echo '1' > ${status};\ + $(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status} ;\ + $(MAKE) -C $(var) -f Makefile.debian8 $@ || echo '1' > ${status} ;\ + $(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status}) + @make -C fpm $@ || echo '1' > ${status} + exit $$(cat ${status}) .PHONY: build push From e4acbd55a8711e5318c97721241752743ad17323 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 10 Nov 2020 10:11:42 +0000 Subject: [PATCH 3/3] chore: remove extra spaces --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index ad846568..b5492b89 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,10 @@ build: status=".status.build" build: @echo '0' > ${status} @$(foreach var,$(TARGETS), \ - $(MAKE) -C $(var) $@ || echo '1' > ${status} ;\ - $(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status} ;\ - $(MAKE) -C $(var) -f Makefile.debian8 $@ || echo '1' > ${status} ;\ - $(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status}) + $(MAKE) -C $(var) $@ || echo '1' > ${status}; \ + $(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status}; \ + $(MAKE) -C $(var) -f Makefile.debian8 $@ || echo '1' > ${status}; \ + $(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status};) @make -C fpm $@ || echo '1' > ${status} exit $$(cat ${status}) @@ -16,10 +16,10 @@ push: status=".status.push" push: @echo '0' > ${status} @$(foreach var,$(TARGETS), \ - $(MAKE) -C $(var) $@ || echo '1' > ${status};\ - $(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status} ;\ - $(MAKE) -C $(var) -f Makefile.debian8 $@ || echo '1' > ${status} ;\ - $(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status}) + $(MAKE) -C $(var) $@ || echo '1' > ${status}; \ + $(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status}; \ + $(MAKE) -C $(var) -f Makefile.debian8 $@ || echo '1' > ${status}; \ + $(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status};) @make -C fpm $@ || echo '1' > ${status} exit $$(cat ${status})