From 7e54eec1ff17e887c574b3396e8d7f14bc751966 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Apr 2015 14:38:49 +0200 Subject: [PATCH 1/3] common/travis/build.sh: fix mistakenly failing tests. --- common/travis/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/common/travis/build.sh b/common/travis/build.sh index 3554113d0d..d59ad64319 100755 --- a/common/travis/build.sh +++ b/common/travis/build.sh @@ -11,3 +11,4 @@ for pkg in $(cat /tmp/templates); do [ $? -eq 1 ] && exit 1 done +exit 0 From 2ac6cbd957049cbcc7d3b6225d52c01647dfa508 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Apr 2015 15:23:28 +0200 Subject: [PATCH 2/3] .travis.yml: remove before_cache hook. not needed. --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 295e53d150..e464cfe45a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,6 @@ env: cache: directories: - $HOME/hostdir/repocache -before_cache: - - mv hostdir/repocache/* $HOME/repocache - before_script: - common/travis/prepare.sh - common/travis/fetch_upstream.sh From bb71db78dd23c85342cd99172f0366fb57dba313 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Apr 2015 15:40:02 +0200 Subject: [PATCH 3/3] common/travis: use the same shebang format for all travis scripts. --- common/travis/bootstrap.sh | 2 +- common/travis/build.sh | 2 +- common/travis/changed_templates.sh | 2 +- common/travis/fetch_upstream.sh | 2 +- common/travis/show_files.sh | 2 +- common/travis/xlint.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/travis/bootstrap.sh b/common/travis/bootstrap.sh index 14af57062b..79ab324a0a 100755 --- a/common/travis/bootstrap.sh +++ b/common/travis/bootstrap.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # # bootstrap.sh diff --git a/common/travis/build.sh b/common/travis/build.sh index d59ad64319..9136bcdc84 100755 --- a/common/travis/build.sh +++ b/common/travis/build.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # # build.sh diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh index 1f7579a703..3565984a81 100755 --- a/common/travis/changed_templates.sh +++ b/common/travis/changed_templates.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # # changed_templates.sh diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh index 47ab226d43..6f7a47a687 100755 --- a/common/travis/fetch_upstream.sh +++ b/common/travis/fetch_upstream.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # # changed_templates.sh diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh index 2f3e26d40f..b7dfa54834 100755 --- a/common/travis/show_files.sh +++ b/common/travis/show_files.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # # show_files.sh diff --git a/common/travis/xlint.sh b/common/travis/xlint.sh index 582ebed9a9..8233ce2a35 100755 --- a/common/travis/xlint.sh +++ b/common/travis/xlint.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # # xlint.sh