Commit 34dbf49f authored by Hans-Christoph Steiner's avatar Hans-Christoph Steiner
Browse files

gitlab-ci: put all the static tests into test job

gitlab-ci used to run all of our jobs in parallel, now it mostly seems
to run them sequentially.  So splitting up the various parts of the CI
suite into separate jobs mostly slows things down.  This combines the
static tests into one job (lint, pmd, checkstyle, tools) with the JVM
tests aka Robolectric.  That makes three jobs from the previous six.
parent 6f43d4eb
...@@ -10,10 +10,16 @@ before_script: ...@@ -10,10 +10,16 @@ before_script:
test: test:
script: script:
- cd app
- ./tools/langs-list-check.py
- ./tools/check-string-format.py
- cd ..
- ./gradlew assemble -PdisablePreDex - ./gradlew assemble -PdisablePreDex
# always report on lint errors to the build log # always report on lint errors to the build log
- sed -i -e 's,textReport .*,textReport true,' app/build.gradle - sed -i -e 's,textReport .*,textReport true,' app/build.gradle
- ./gradlew lint -PdisablePreDex - ./gradlew lint -PdisablePreDex
- ./gradlew pmd -PdisablePreDex
- ./gradlew checkstyle -PdisablePreDex
- ./gradlew test -PdisablePreDex || { - ./gradlew test -PdisablePreDex || {
for log in app/build/reports/*ests/*/*ml; do for log in app/build/reports/*ests/*/*ml; do
echo "read $log here:"; echo "read $log here:";
...@@ -64,24 +70,6 @@ connected24: ...@@ -64,24 +70,6 @@ connected24:
done done
- exit $EXITVALUE - exit $EXITVALUE
pmd:
script:
- ./gradlew pmd -PdisablePreDex
checkstyle:
script:
- ./gradlew checkstyle -PdisablePreDex
tools:
before_script:
- echo "ignored, no gradle needed"
script:
- cd app
- ./tools/langs-list-check.py
- ./tools/check-string-format.py
after_script:
- echo "ignored, no gradle needed"
after_script: after_script:
# this file changes every time but should not be cached # this file changes every time but should not be cached
- rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment