FINERACT-1198 - Revert spotlessApply and use only spotlessCheck
This commit is contained in:
committed by
Petri Tuomola
parent
b96061613b
commit
6a55a80c7d
+1
-1
@@ -74,6 +74,6 @@ script:
|
||||
# using "&&" instead of several "-" means that integrationTest does not run if test fails,
|
||||
# and Docker test does not run if integration test fails, which makes PR failure easier to understand.
|
||||
# @see https://docs.travis-ci.com/user/job-lifecycle/#customizing-the-build-phase
|
||||
- ./gradlew --no-daemon --console=plain -PautomatedBuild=true licenseMain licenseTest check build test --fail-fast doc && sudo service mysql stop && docker-compose build && docker-compose up -d && sleep 60s && curl -f -k --retry 5 --retry-connrefused --connect-timeout 30 --retry-delay 30 https://localhost:8443/fineract-provider/actuator/health && (( $(curl -f -k --retry 5 --retry-connrefused --connect-timeout 30 --retry-delay 30 https://localhost:8443/fineract-provider/actuator/info | wc --chars) > 100 ))
|
||||
- ./gradlew --no-daemon --console=plain licenseMain licenseTest check build test --fail-fast doc && sudo service mysql stop && docker-compose build && docker-compose up -d && sleep 60s && curl -f -k --retry 5 --retry-connrefused --connect-timeout 30 --retry-delay 30 https://localhost:8443/fineract-provider/actuator/health && (( $(curl -f -k --retry 5 --retry-connrefused --connect-timeout 30 --retry-delay 30 https://localhost:8443/fineract-provider/actuator/info | wc --chars) > 100 ))
|
||||
# We stop the mysql system service when running the Docker test to avoid port 3306 conflicts (unless we run the mysql in docker-compose on another port; req. FINERACT-773)
|
||||
# The fancy /actuator/info test makes sure that has more than 100 characters of JSON to test that the git.properties worked (see FINERACT-983)
|
||||
|
||||
+1
-7
@@ -461,13 +461,7 @@ configure(project.fineractJavaProjects) {
|
||||
lineEndings 'UNIX'
|
||||
}
|
||||
|
||||
compileJava {
|
||||
if (project.hasProperty('automatedBuild')) {
|
||||
dependsOn(spotlessCheck)
|
||||
} else {
|
||||
dependsOn(spotlessApply)
|
||||
}
|
||||
}
|
||||
compileJava.dependsOn spotlessCheck
|
||||
|
||||
// If we are running Gradle within Eclipse to enhance classes with OpenJPA,
|
||||
// set the classes directory to point to Eclipse's default build directory
|
||||
|
||||
Reference in New Issue
Block a user