diff --git a/.travis.yml b/.travis.yml index 16337830..a24c5737 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: java jdk: oraclejdk8 install: true -script: ./gradlew test +script: ./gradlew check deploy: - provider: releases api_key: diff --git a/build.gradle b/build.gradle index 676780c1..0459c9eb 100644 --- a/build.gradle +++ b/build.gradle @@ -139,3 +139,9 @@ ant.properties.'ci.build.num' = "${tagMatcher().find() ? tagMatcher()[0][2] : '9 'generateUpdatePluginsXml' } } + +task check { + dependsOn { + [':coderules-test', ':samples/mpscore:mpscore-test'] + } +} diff --git a/samples/mpscore/build.gradle b/samples/mpscore/build.gradle index e91f15e7..66cd95f3 100644 --- a/samples/mpscore/build.gradle +++ b/samples/mpscore/build.gradle @@ -14,4 +14,22 @@ ant.taskdef(name: 'junit', classname: 'org.apache.tools.ant.taskdefs.optional.junit.JUnitTask', classpath: configurations.junitAnt.asPath) -ant.importBuild('build.xml') +ant.importBuild('build.xml') {antTarget -> + 'mpscore-'+antTarget +} + +// ensure 'generate' runs before 'classes' ('generate' is NOT optional) +'mpscore-classes' { + dependsOn { + 'mpscore-generate' + } + mustRunAfter { + 'mpscore-generate' + } +} + +'mpscore-generate' { + dependsOn { + ':coderules-assemble' + } +}