From 3cc7afe555ec1a81ac1ae0f9c78bd2a9cf704378 Mon Sep 17 00:00:00 2001 From: Neil Parley Date: Sun, 26 Jun 2016 13:11:59 +0100 Subject: [PATCH 1/3] Force rebuilding of python files in PR --- ci/prep_cython_cache.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/prep_cython_cache.sh b/ci/prep_cython_cache.sh index 162f7a1034be6..3295bd15d016c 100755 --- a/ci/prep_cython_cache.sh +++ b/ci/prep_cython_cache.sh @@ -21,6 +21,8 @@ if [ -f "$CACHE_File" ] && [ "$USE_CACHE" ]; then echo "PR: checking for any cython file changes from last 5 commits" git diff PR_HEAD~5 --numstat | grep -E "pyx|pxd" retval=$(git diff PR_HEAD~5 --numstat | grep -E "pyx|pxd"| wc -l) + echo "Forcing cython rebuild due to possibility of history rewritting in PR" + retval=-1 fi echo "number of cython files changed: $retval" fi From 7fcccc05cad80f8fe30d0c39be250db3d95e7ebe Mon Sep 17 00:00:00 2001 From: Neil Parley Date: Sun, 26 Jun 2016 21:59:07 +0100 Subject: [PATCH 2/3] Testing commit --- DO_NOT_MERGE | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 DO_NOT_MERGE diff --git a/DO_NOT_MERGE b/DO_NOT_MERGE new file mode 100644 index 0000000000000..e69de29bb2d1d From 75e71e775d45938f11afe4b2799e5c94efa7119f Mon Sep 17 00:00:00 2001 From: Neil Parley Date: Sun, 26 Jun 2016 22:00:10 +0100 Subject: [PATCH 3/3] Undo test commit --- DO_NOT_MERGE | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 DO_NOT_MERGE diff --git a/DO_NOT_MERGE b/DO_NOT_MERGE deleted file mode 100644 index e69de29bb2d1d..0000000000000