Set JaCoCo evaluation via variable (#1213)
* Set JaCoCo evaluation via variable
* Fix variable syntax
* Try syntax again
* And again
* Evaluate against currentName
* More syntax fixes
* Evaluate condition via eq
* Fix logic
* Temp disable failing tests
* Revert "Temp disable failing tests"
This reverts commit 9ff4c88271
.
* Bump jacoco + change version property in reports
* Re-use logic for codecov execution
This commit is contained in:
parent
4478e166a9
commit
6a21d05ab8
|
@ -16,7 +16,6 @@
|
|||
|
||||
<properties>
|
||||
<maven.deploy.skip>true</maven.deploy.skip>
|
||||
<jacoco_version>0.8.5</jacoco_version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -25,7 +25,7 @@
|
|||
<maven_surefire_version>3.0.0-M5</maven_surefire_version>
|
||||
<maven_clean_version>3.1.0</maven_clean_version>
|
||||
<okhttp.version>4.9.3</okhttp.version>
|
||||
<jacoco_version>0.8.8</jacoco_version>
|
||||
<jacoco_version>0.8.9</jacoco_version>
|
||||
<info_cqframework_version>1.5.1</info_cqframework_version>
|
||||
<lombok_version>1.18.22</lombok_version>
|
||||
<byte_buddy_version>1.12.14</byte_buddy_version>
|
||||
|
|
|
@ -13,6 +13,7 @@ jobs:
|
|||
codecov: $(CODECOV_TOKEN)
|
||||
VERSION:
|
||||
JAVA_TOOL_OPTIONS: ${{image.javaToolOptions}}
|
||||
skipJaCoCo: $[not(eq(variables['currentName'], 'ubuntu-latest-java-11'))]
|
||||
|
||||
steps:
|
||||
- task: Cache@2
|
||||
|
@ -23,7 +24,7 @@ jobs:
|
|||
- task: Maven@3
|
||||
inputs:
|
||||
mavenPomFile: 'pom.xml'
|
||||
options: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
|
||||
options: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) -Djacoco.skip=$(skipJaCoCo)'
|
||||
mavenOptions: '-Xmx768m -Dmaven.resolver.transport=wagon'
|
||||
javaHomeOption: 'JDKVersion'
|
||||
jdkVersionOption: '${{image.jdkVersion}}'
|
||||
|
@ -47,12 +48,12 @@ jobs:
|
|||
# Upload test results to codecov
|
||||
- script: bash <(curl https://codecov.io/bash) -t $(codecov)
|
||||
displayName: 'codecov Bash Uploader'
|
||||
condition: eq(variables.currentName, 'ubuntu-latest-java-11')
|
||||
condition: eq(variables.skipJaCoCo, false)
|
||||
|
||||
# Publishes the test results to build artifacts.
|
||||
- task: PublishCodeCoverageResults@1
|
||||
displayName: 'Publish JaCoCo test results'
|
||||
condition: eq(variables.currentName, 'ubuntu-latest-java-11')
|
||||
condition: eq(variables.skipJaCoCo, false)
|
||||
inputs:
|
||||
codeCoverageTool: 'JaCoCo'
|
||||
summaryFileLocation: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.report/target/site/jacoco-aggregate/jacoco.xml'
|
||||
|
|
Loading…
Reference in New Issue