Warn about config permissions before loading the defaults

[fdroidserver.git] / jenkins-build

diff --git a/jenkins-build b/jenkins-build
index dbdea777fc849bc03f7c63114499e7ad5a759d8d..35add775cf37ae57b34a3d8b16f81ee268b043f5 100755 (executable)
--- a/jenkins-build
+++ b/jenkins-build
@@ -47,7 +47,7 @@ cd $WORKSPACE/fdroidserver/getsig
 #------------------------------------------------------------------------------#
 # run local tests
 cd $WORKSPACE/tests
-./run-tests
+./run-tests ~jenkins/
 
 
 #------------------------------------------------------------------------------#
@@ -67,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
+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
 
 
 #------------------------------------------------------------------------------#