Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update maven config and tests to allow Java 8, 11 and 17 builds #653

Merged
merged 12 commits into from
Nov 16, 2021
Prev Previous commit
Next Next commit
Cleanup skipped test, move new pipeline codo
dotasek committed Nov 12, 2021
commit 6adeb51eba6a47a2e230a5207d66517c1aabd219
Original file line number Diff line number Diff line change
@@ -653,7 +653,7 @@ private void loadFromBuildServer() throws IOException {
http.trustAllhosts();
HTTPResult res = http.get("https://build.fhir.org/ig/qas.json?nocache=" + System.currentTimeMillis());
res.checkThrowException();
TextFile.bytesToFile(res.getContent(), "c:\\temp\\qa.json");
//TextFile.bytesToFile(res.getContent(), "c:\\temp\\qa.json");
buildInfo = (JsonArray) new com.google.gson.JsonParser().parse(TextFile.bytesToString(res.getContent()));

List<BuildRecord> builds = new ArrayList<>();
Original file line number Diff line number Diff line change
@@ -101,8 +101,6 @@ public static Iterable<Object[]> data() throws IOException {

List<Object[]> objects = new ArrayList<Object[]>(examples.size());
for (String id : names) {
//DIRTY_DO Remove this before merge to master
if (!id.equals("uk-msg"))
objects.add(new Object[]{id, examples.get(id)});
}
return objects;
66 changes: 10 additions & 56 deletions pull-request-pipeline.yml
Original file line number Diff line number Diff line change
@@ -5,59 +5,13 @@ pr:
- release

# Different users have different machine setups, we run the build three times, on ubuntu, osx, and windows
strategy:
matrix:
linux:
imageName: 'ubuntu-latest'
mac:
imageName: "macos-latest"
windows:
imageName: "windows-2019"
maxParallel: 3

pool:
vmImage: $(imageName)

variables:
currentImage: $(imageName)
codecov: $(CODECOV_TOKEN)
VERSION:

steps:
# Runs 'mvn clean package'
- task: Maven@3
inputs:
mavenPomFile: 'pom.xml'
mavenOptions: '-Xmx3072m'
javaHomeOption: 'JDKVersion'
jdkVersionOption: '1.11'
jdkArchitectureOption: 'x64'
publishJUnitResults: true
testResultsFiles: '**/surefire-reports/TEST-*.xml'
goals: 'package'

- task: Maven@3
inputs:
mavenPomFile: 'pom.xml'
mavenOptions: '-Xmx3072m'
javaHomeOption: 'JDKVersion'
jdkVersionOption: '1.11'
jdkArchitectureOption: 'x64'
options: '-pl org.hl7.fhir.validation.cli'
publishJUnitResults: false
testResultsFiles: '**/surefire-reports/TEST-*.xml'
goals: 'exec:exec'

# Upload test results to codecov
- script: bash <(curl https://codecov.io/bash) -t $(codecov)
displayName: 'codecov Bash Uploader'
condition: eq(variables.currentImage, 'ubuntu-latest')

# Publishes the test results to build artifacts.
- task: PublishCodeCoverageResults@1
displayName: 'Publish JaCoCo test results'
condition: eq(variables.currentImage, 'ubuntu-latest')
inputs:
codeCoverageTool: 'JaCoCo'
summaryFileLocation: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.report/target/site/jacoco-aggregate/jacoco.xml'
reportDirectory: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.report/target/site/jacoco-aggregate/'
jobs:
- template: pull-request-pipeline-parameterized.yml
parameters:
images:
- name: ubuntu-latest
jdkVersions: [ '1.8', '1.11' ]
- name: macos-latest
jdkVersions: [ '1.8', '1.11', '1.17']
- name: windows-2019
jdkVersions: [ '1.8', '1.11', '1.17']
16 changes: 0 additions & 16 deletions test-java-8-11-17-pipeline.yml

This file was deleted.