litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Modified gradle task

Browse source
This commit is contained in:
Georgy Litvinov 2021-03-12 23:18:04 +01:00
parent fc43ce34e4
commit 93592950dd
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -5,7 +5,7 @@ stages:
build: build:
stage: build stage: build
script: gradle jar && gradle oxt script: ./gradlew regressionTests ./gradlew jar && ./gradlew oxt
artifacts: artifacts:
paths: paths:
- build/distributions/w2phtml.oxt - build/distributions/w2phtml.oxt

22
build.gradle
View file

@ -12,7 +12,7 @@ mkdir "src/main/tmp/w2phtml"
propertyDestFile.withWriter { properties.store(it, null) } propertyDestFile.withWriter { properties.store(it, null) }
sourceSets { sourceSets {
regressionTest { regressionTests {
java { java {
compileClasspath += main.output + test.output compileClasspath += main.output + test.output
runtimeClasspath += main.output + files('src/main/java') runtimeClasspath += main.output + files('src/main/java')
@ -23,15 +23,15 @@ sourceSets {
sourceCompatibility = 1.8 sourceCompatibility = 1.8
configurations{ configurations{
bundledLibs bundledLibs
regressionTestCompile.extendsFrom mainCompile regressionTestsCompile.extendsFrom mainCompile
regressionTestRuntime.extendsFrom mainRuntime regressionTestsRuntime.extendsFrom mainRuntime
regressionTestRuntime.extendsFrom bundledLibs regressionTestsRuntime.extendsFrom bundledLibs
} }
dependencies{ dependencies{
regressionTestImplementation group: 'commons-io', name: 'commons-io', version: '2.8.0' regressionTestsImplementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
regressionTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.1' regressionTestsImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.1'
regressionTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.1' regressionTestsImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.1'
regressionTestRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' regressionTestsRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
bundledLibs 'org.libreoffice:jurt:5.3.2' bundledLibs 'org.libreoffice:jurt:5.3.2'
bundledLibs 'org.libreoffice:juh:5.3.2' bundledLibs 'org.libreoffice:juh:5.3.2'
@ -215,9 +215,9 @@ task oxtNew(type: Zip){
from 'releasenotes.txt' from 'releasenotes.txt'
include '*' include '*'
} }
task regressionTest(type: Test) { task regressionTests(type: Test) {
testClassesDirs = sourceSets.regressionTest.output.classesDirs testClassesDirs = sourceSets.regressionTests.output.classesDirs
classpath = sourceSets.regressionTest.runtimeClasspath classpath = sourceSets.regressionTests.runtimeClasspath
useJUnitPlatform() useJUnitPlatform()
testLogging { testLogging {
events "passed", "skipped", "failed", "standardOut", "standardError" events "passed", "skipped", "failed", "standardOut", "standardError"