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

feat: Bump CI versions #140

Merged
merged 2 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
# Java and .NET are already installed on ubuntu-latest

- name: Firely.Terminal (GitHub Actions)
uses: FirelyTeam/firely-terminal-pipeline@v0.3.5
uses: FirelyTeam/firely-terminal-pipeline@v0.4.0
with:
PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/
# PATH_TO_EXAMPLES: Examples # Examples still need to be separated from the conformance resources
Expand All @@ -40,7 +40,7 @@ jobs:
SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
SUSHI_ENABLED: true
SUSHI_OPTIONS: Resources/
SUSHI_VERSION: 2.10.2
SUSHI_VERSION: 3.5.0
EXPECTED_FAILS: VALIDATION_CONFORMANCE_JAVA VALIDATION_CONFORMANCE_DOTNET

- name: Add & Commit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
},
"valueQuantity": {
"system": "http://unitsofmeasure.org",
"value": 26,
"code": "/min",
"value": 26,
"unit": "Atemzüge pro Minute"
},
"status": "final",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
},
"valueQuantity": {
"system": "http://unitsofmeasure.org",
"value": 107,
"code": "mm[Hg]",
"value": 107,
"unit": "mmHg"
}
},
Expand All @@ -56,8 +56,8 @@
},
"valueQuantity": {
"system": "http://unitsofmeasure.org",
"value": 60,
"code": "mm[Hg]",
"value": 60,
"unit": "mmHg"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
},
"valueQuantity": {
"system": "http://unitsofmeasure.org",
"value": 4,
"code": "1",
"value": 4,
"unit": "Punktwert"
}
},
Expand All @@ -60,8 +60,8 @@
},
"valueQuantity": {
"system": "http://unitsofmeasure.org",
"value": 4,
"code": "1",
"value": 4,
"unit": "Punktwert"
}
},
Expand All @@ -76,8 +76,8 @@
},
"valueQuantity": {
"system": "http://unitsofmeasure.org",
"value": 3,
"code": "1",
"value": 3,
"unit": "Punktwert"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
},
"valueQuantity": {
"system": "http://unitsofmeasure.org",
"value": 63,
"code": "/min",
"value": 63,
"unit": "per minute"
},
"status": "final",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
},
"valueQuantity": {
"system": "http://unitsofmeasure.org",
"value": 36.8,
"code": "Cel",
"value": 36.8,
"unit": "°C"
},
"status": "final",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
},
"valueQuantity": {
"system": "http://unitsofmeasure.org",
"value": 98,
"code": "%",
"value": 98,
"unit": "%"
},
"component": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,28 +90,34 @@
"mustSupport": true
},
{
"id": "Observation.valueQuantity",
"path": "Observation.valueQuantity",
"id": "Observation.value[x]:valueQuantity",
"path": "Observation.value[x]",
"sliceName": "valueQuantity",
"type": [
{
"code": "Quantity"
}
],
"mustSupport": true
},
{
"id": "Observation.valueQuantity.value",
"path": "Observation.valueQuantity.value",
"id": "Observation.value[x]:valueQuantity.value",
"path": "Observation.value[x].value",
"mustSupport": true
},
{
"id": "Observation.valueQuantity.unit",
"path": "Observation.valueQuantity.unit",
"id": "Observation.value[x]:valueQuantity.unit",
"path": "Observation.value[x].unit",
"mustSupport": true
},
{
"id": "Observation.valueQuantity.system",
"path": "Observation.valueQuantity.system",
"id": "Observation.value[x]:valueQuantity.system",
"path": "Observation.value[x].system",
"mustSupport": true
},
{
"id": "Observation.valueQuantity.code",
"path": "Observation.valueQuantity.code",
"id": "Observation.value[x]:valueQuantity.code",
"path": "Observation.value[x].code",
"mustSupport": true
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,14 @@
"mustSupport": true
},
{
"id": "Observation.component:SystolicBP.valueQuantity",
"path": "Observation.component.valueQuantity",
"id": "Observation.component:SystolicBP.value[x]:valueQuantity",
"path": "Observation.component.value[x]",
"sliceName": "valueQuantity",
"type": [
{
"code": "Quantity"
}
],
"mustSupport": true
},
{
Expand All @@ -142,8 +148,14 @@
"mustSupport": true
},
{
"id": "Observation.component:DiastolicBP.valueQuantity",
"path": "Observation.component.valueQuantity",
"id": "Observation.component:DiastolicBP.value[x]:valueQuantity",
"path": "Observation.component.value[x]",
"sliceName": "valueQuantity",
"type": [
{
"code": "Quantity"
}
],
"mustSupport": true
}
]
Expand Down
33 changes: 8 additions & 25 deletions Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,43 +91,26 @@
{
"id": "Observation.component.value[x]",
"path": "Observation.component.value[x]",
"slicing": {
"discriminator": [
{
"type": "type",
"path": "$this"
}
],
"ordered": false,
"rules": "open"
},
"mustSupport": true
},
{
"id": "Observation.component.valueSampledData",
"path": "Observation.component.valueSampledData",
"min": 1,
"max": "1",
"id": "Observation.component.value[x].origin",
"path": "Observation.component.value[x].origin",
"mustSupport": true
},
{
"id": "Observation.component.valueSampledData.origin",
"path": "Observation.component.valueSampledData.origin",
"id": "Observation.component.value[x].period",
"path": "Observation.component.value[x].period",
"mustSupport": true
},
{
"id": "Observation.component.valueSampledData.period",
"path": "Observation.component.valueSampledData.period",
"id": "Observation.component.value[x].dimensions",
"path": "Observation.component.value[x].dimensions",
"mustSupport": true
},
{
"id": "Observation.component.valueSampledData.dimensions",
"path": "Observation.component.valueSampledData.dimensions",
"mustSupport": true
},
{
"id": "Observation.component.valueSampledData.data",
"path": "Observation.component.valueSampledData.data",
"id": "Observation.component.value[x].data",
"path": "Observation.component.value[x].data",
"mustSupport": true
}
]
Expand Down
Loading