From 5a077a1b43cfc50f665c4b6f2c5b2b8df1f0ca38 Mon Sep 17 00:00:00 2001 From: Kurt Pfeifle Date: Mon, 26 Feb 2018 21:58:16 +0100 Subject: [PATCH 1/3] Possible fix for #379 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ae71f86f73..4a301e183d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,9 +25,11 @@ script: - Xvfb :99 -screen 0 800x600x24 >/dev/null 2>&1 & # Need to set bit depth, otherwise get some black screenshots - # until xset -q; do echo "Waiting for X server to start..."; sleep 1; done # We are not immediately using it anyway - # Find out which files in data/ have been changed in the last commit + - set -x # Debug #379 - FILES=$(git log -1 -p data/ | grep +++ | cut -d '/' -f 2- | sed -e 's|dev/null||g') - # Work on these files that have been changed in the last commit - - for FILE in $FILES ; do echo "$FILE" ; bash -e code/worker.sh $(readlink -f "$FILE") ; done + - # Check if $FILES is not empty + - if [ x"$FILES" != x ] ; then for FILE in $FILES ; do echo "$FILE" ; bash -e code/worker.sh $(readlink -f "$FILE") ; done ; fi after_script: - # xpra stop :99 From 26500abbf847c5b2dc7f25d1560d441f240f9c01 Mon Sep 17 00:00:00 2001 From: Kurt Pfeifle Date: Mon, 26 Feb 2018 22:04:25 +0100 Subject: [PATCH 2/3] Disable 'set -x'; use 'echo "$FILES"' --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4a301e183d..0493829893 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,9 @@ script: - Xvfb :99 -screen 0 800x600x24 >/dev/null 2>&1 & # Need to set bit depth, otherwise get some black screenshots - # until xset -q; do echo "Waiting for X server to start..."; sleep 1; done # We are not immediately using it anyway - # Find out which files in data/ have been changed in the last commit - - set -x # Debug #379 + - #set -x # Debug #379 - FILES=$(git log -1 -p data/ | grep +++ | cut -d '/' -f 2- | sed -e 's|dev/null||g') + - echo "$FILES" - # Work on these files that have been changed in the last commit - # Check if $FILES is not empty - if [ x"$FILES" != x ] ; then for FILE in $FILES ; do echo "$FILE" ; bash -e code/worker.sh $(readlink -f "$FILE") ; done ; fi From f19933d021c8e698009d70f9302482b97985daf3 Mon Sep 17 00:00:00 2001 From: Kurt Pfeifle Date: Mon, 26 Feb 2018 22:10:27 +0100 Subject: [PATCH 3/3] Report content of $FILES in Travis log --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0493829893..a00b143ba0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ script: - # Find out which files in data/ have been changed in the last commit - #set -x # Debug #379 - FILES=$(git log -1 -p data/ | grep +++ | cut -d '/' -f 2- | sed -e 's|dev/null||g') - - echo "$FILES" + - echo "$FILES" ; if [ x"$FILES" == x ] ; then echo "Variable FILES is empty." ; fi - # Work on these files that have been changed in the last commit - # Check if $FILES is not empty - if [ x"$FILES" != x ] ; then for FILE in $FILES ; do echo "$FILE" ; bash -e code/worker.sh $(readlink -f "$FILE") ; done ; fi