From 4438d116b1595d7a56ee8b2bdf5e7b4ebf19e92a Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Wed, 2 May 2018 11:08:53 +0200 Subject: [PATCH] Ensure that Travis CI fails the build if the patches are incorrect --- .travis.yml | 1 + Makefile | 2 +- _assets/patches/patcher | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a8359c8d..42ee9ae6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ jobs: include: - stage: Lint & Vendor Check sudo: required + before_script: make dep-ensure script: - make lint - make vendor-check diff --git a/Makefile b/Makefile index 2f5eff618..d69b2ea2a 100644 --- a/Makefile +++ b/Makefile @@ -156,7 +156,7 @@ lint: @echo "lint" @gometalinter ./... -ci: lint mock test-unit test-e2e ##@tests Run all linters and tests at once +ci: lint mock dep-ensure test-unit test-e2e ##@tests Run all linters and tests at once clean: ##@other Cleanup rm -fr build/bin/* diff --git a/_assets/patches/patcher b/_assets/patches/patcher index 806fd3949..02040fee7 100755 --- a/_assets/patches/patcher +++ b/_assets/patches/patcher @@ -182,7 +182,7 @@ for ((i=0; i<${#patches[@]}; i++)); do echo "Failed and reverting: $f" gitApplyReverse "$f" "$basepath" echo -en "\\n" - exit + exit 1 fi done