From 9fa5914ef3f9054f6dd705ae4f269fcb90690b32 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Thu, 30 Mar 2017 09:37:00 +0000 Subject: [PATCH] fix the error exiting, and use the Makefile logging Signed-off-by: Sven Dowideit --- Makefile | 2 +- scripts/ci | 5 ++++- scripts/release | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 48868a6..7fb355f 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ TARGETS := $(shell ls scripts | grep -vE 'clean') @mv .dapper.tmp .dapper $(TARGETS): .dapper - ./.dapper $@ | tee $@.log + ./.dapper $@ 2>&1 | tee $@.log shell-bind: .dapper ./.dapper -m bind -s diff --git a/scripts/ci b/scripts/ci index 5cf48d7..6673dd3 100755 --- a/scripts/ci +++ b/scripts/ci @@ -3,7 +3,10 @@ set -e cd $(dirname $0)/.. -./scripts/download +if ! ./scripts/download; then + echo "blah" + exit 1 +fi ./scripts/extract run-parts -v ./scripts/hooks ./scripts/build-kernel diff --git a/scripts/release b/scripts/release index 33dfbb9..cc50268 100755 --- a/scripts/release +++ b/scripts/release @@ -2,7 +2,10 @@ cd $(dirname $0)/.. -./scripts/ci 2>&1 | tee build.log +if ! ./scripts/ci; then + echo "build failure see release.log" + exit 1 +fi mv build.log dist/ echo