tsk/819 include missing documentation and improve readability

This commit is contained in:
Martin Rojas Miguel Angel 2019-03-28 12:11:54 +01:00 committed by Mustapha Zorgati
parent 9296579aff
commit ced5929660
2 changed files with 11 additions and 10 deletions

View File

@ -48,8 +48,8 @@ jobs:
&& ci/change_version.sh -m "lib/ rest/" -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java && ci/change_version.sh -m "lib/ rest/" -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
script: script:
- (cd web && npm run build:prod) - (cd web && npm run build:prod)
&& mvn clean install -q -f lib -DskipTests -Dmaven.javadoc.skip=true && mvn clean install -q -f lib -DskipTests -Dmaven.javadoc.skip
&& mvn clean install -q -f rest -DskipTests -Dmaven.javadoc.skip=true -P history.plugin && mvn clean install -q -f rest -DskipTests -Dmaven.javadoc.skip -P history.plugin
- stage: "Release / Deploy" - stage: "Release / Deploy"
name: "Release stage" name: "Release stage"
script: script:

View File

@ -6,7 +6,7 @@ set -e # fail fast
#H #H
#H prints this help and exits #H prints this help and exits
#H #H
#H test.sh <database> #H test.sh <database> <project>
#H #H
#H tests the taskana application #H tests the taskana application
#H #H
@ -31,18 +31,19 @@ function main {
[[ $# -eq 0 || "$1" == '-h' || "$1" == '--help' ]] && helpAndExit 0 [[ $# -eq 0 || "$1" == '-h' || "$1" == '--help' ]] && helpAndExit 0
REL=`dirname "$0"` REL=`dirname "$0"`
eval "$REL/prepare_db.sh '$1'" eval "$REL/prepare_db.sh '$1'"
if [[ "$1" == "H2" && "$2" == "LIB" ]]; then #main stage H2 && REST it requires to package rest again because documentation is included in test phase
mvn clean install -q -f $REL/../lib/ -B if [[ "$1" == "H2" && "$2" == "REST" ]]; then
elif [[ "$1" == "H2" && "$2" == "REST" ]]; then
(cd $REL/../web && npm run test) (cd $REL/../web && npm run test)
mvn clean install -q -f $REL/../rest/ -B mvn clean install -q -f $REL/../rest/ -B
mvn clean verify -q -f $REL/../rest/ -B -pl taskana-rest-spring-example -P history.plugin mvn clean verify -q -f $REL/../rest/ -B -pl taskana-rest-spring-example -P history.plugin
elif [[ "$1" == "H2" && "$2" == "LIB" ]]; then
mvn clean install -q -f $REL/../lib/ -B -Dmaven.javadoc.skip
elif [[ "$1" == "POSTGRES_10_4" && "$2" == "CORE" ]]; then elif [[ "$1" == "POSTGRES_10_4" && "$2" == "CORE" ]]; then
mvn clean verify -q -f $REL/../lib/taskana-core -B mvn clean verify -q -f $REL/../lib/taskana-core -B
elif [[ "$1" == "POSTGRES_10_4" && "$2" == "WILDFLY" ]]; then elif [[ "$1" == "POSTGRES_10_4" && "$2" == "WILDFLY" ]]; then
mvn clean install -q -f $REL/../lib/ -B -DskipTests=true -Dmaven.javadoc.skip=true mvn clean install -q -f $REL/../lib/ -B -DskipTests -Dmaven.javadoc.skip
mvn clean install -q -f $REL/../rest/ -B -DskipTests=true -pl !taskana-rest-spring-wildfly-example -Dmaven.javadoc.skip=true mvn clean install -q -f $REL/../rest/ -B -DskipTests -pl !taskana-rest-spring-wildfly-example -Dmaven.javadoc.skip
mvn clean install -q -f $REL/../rest/ -B -pl taskana-rest-spring-wildfly-example -Dmaven.javadoc.skip=true -P postgres mvn clean install -q -f $REL/../rest/ -B -pl taskana-rest-spring-wildfly-example -Dmaven.javadoc.skip -P postgres
else else
mvn clean verify -q -f $REL/../lib/taskana-core -B mvn clean verify -q -f $REL/../lib/taskana-core -B
fi fi