Warn about config permissions before loading the defaults

[fdroidserver.git] / jenkins-build

diff --git a/jenkins-build b/jenkins-build
index 8163962686a33dac3e393fba60d69a2cfc0ad651..35add775cf37ae57b34a3d8b16f81ee268b043f5 100755 (executable)
--- a/jenkins-build
+++ b/jenkins-build
@@ -25,6 +25,14 @@ if [ -z $ANDROID_HOME ]; then
     fi
 fi
 
+
+#------------------------------------------------------------------------------#
+# cache pypi downloads
+if [ -z $PIP_DOWNLOAD_CACHE ]; then
+    export PIP_DOWNLOAD_CACHE=$HOME/.pip_download_cache
+fi
+
+
 #------------------------------------------------------------------------------#
 # required Java 7 keytool/jarsigner for :file support
 
@@ -39,7 +47,7 @@ cd $WORKSPACE/fdroidserver/getsig
 #------------------------------------------------------------------------------#
 # run local tests
 cd $WORKSPACE/tests
-./run-tests.sh
+./run-tests ~jenkins/
 
 
 #------------------------------------------------------------------------------#
@@ -59,12 +67,12 @@ python setup.py install
 
 # run tests in new pip+virtualenv install
 . $WORKSPACE/env/bin/activate
-fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests.sh
+fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests ~jenkins/
 
 
 #------------------------------------------------------------------------------#
-# run pyflakes
-pyflakes fdroid makebuildserver fdroidserver/*.py setup.py
+# run git pre-commit hook for pep8, pyflakes, etc
+sh hooks/pre-commit
 
 
 #------------------------------------------------------------------------------#