From 08bef4f2db67dd859fe172cd7e4858dd90a64e44 Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 08:59:43 +0100 Subject: [PATCH 01/20] Update to kbv.ita.erp 1.1.x --- Resources/sushi-config.yaml | 2 +- fhirpkg.lock.json | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index 89ec4ac0..2b5241c3 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -17,4 +17,4 @@ dependencies: de.basisprofil.r4: 1.3.2 hl7.fhir.r4.core: 4.0.1 kbv.ita.for: 1.1.0 - kbv.ita.erp: 1.1.1 \ No newline at end of file + kbv.ita.erp: 1.1.x \ No newline at end of file diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json index ed0fd170..170a44c2 100644 --- a/fhirpkg.lock.json +++ b/fhirpkg.lock.json @@ -1,7 +1,7 @@ { - "updated": "2022-10-04T15:25:13.7837722+02:00", + "updated": "2023-11-28T08:57:44.285755+01:00", "dependencies": { - "kbv.ita.erp": "1.1.0", + "kbv.ita.erp": "1.1.2", "KBV.Basis": "1.3.0", "de.basisprofil.r4": "1.3.2", "hl7.fhir.r4.core": "4.0.1", diff --git a/package.json b/package.json index f683e188..55cb0fb9 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "description": "ePrescription workflow specification.\r\nRessources for ePrescription workflow major update 01.07.2023", "author": "gematik", "dependencies": { - "kbv.ita.erp": "1.1.1", + "kbv.ita.erp": "1.1.x", "kbv.ita.for": "1.1.0", "de.basisprofil.r4": "1.3.2", "hl7.fhir.r4.core": "4.0.1" From cf697fbee74e6e41d82f2b0f9281c7acaea39ea1 Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 09:12:07 +0100 Subject: [PATCH 02/20] Update github action firely pipeline --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ea32f16a..214f22ac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: # Java and .NET are already installed on ubuntu-latest - name: Firely.Terminal (GitHub Actions) - uses: FirelyTeam/firely-terminal-pipeline@v0.3.2 + uses: FirelyTeam/firely-terminal-pipeline@v0.4.0 with: PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/ #PATH_TO_EXAMPLES: Examples From cd9986052eba074c029770a0ffcc5568023ec1f7 Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 09:17:06 +0100 Subject: [PATCH 03/20] Update Sushi Version to 3.5.0 in pipeline --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 214f22ac..87d65856 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,6 +41,7 @@ jobs: SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true + SUSHI_VERSION: 3.5.0 SUSHI_OPTIONS: Resources/ EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA From ed6d90cdac9a9bb00afed828807e8c144f9ed87a Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 09:54:05 +0100 Subject: [PATCH 04/20] add fail for pipeline if there are changes in pipeline --- .github/workflows/main.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 87d65856..71c75e4b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: with: PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/ #PATH_TO_EXAMPLES: Examples - PATH_TO_QUALITY_CONTROL_RULES: qc/custom + #PATH_TO_QUALITY_CONTROL_RULES: qc/custom DOTNET_VALIDATION_ENABLED: true JAVA_VALIDATION_ENABLED: true OUTPUT_FORMAT: RAW @@ -45,7 +45,8 @@ jobs: SUSHI_OPTIONS: Resources/ EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA - - name: Add & Commit - uses: EndBug/add-and-commit@v7 - with: - add: 'Resources/fsh-generated/resources/' + - name: Check for Uncommitted Changes + run: | + git diff --exit-code || (echo "Es gibt Änderungen durch die Pipline. Lokale Sushi Konfiguration prüfen!" && exit 1) + + From e4bb8800682bd2184f8df84943a63c8c3b85ab58 Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 10:01:42 +0100 Subject: [PATCH 05/20] add option for quiet git diff --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 71c75e4b..79f107ef 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,6 +47,6 @@ jobs: - name: Check for Uncommitted Changes run: | - git diff --exit-code || (echo "Es gibt Änderungen durch die Pipline. Lokale Sushi Konfiguration prüfen!" && exit 1) + git diff --quiet || (echo "Es gibt Änderungen durch die Pipline. Lokale Sushi Konfiguration prüfen!" && exit 1) From 18e4b2a6b58dda51be05e6f69228616c41e924fb Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 10:15:15 +0100 Subject: [PATCH 06/20] Add option for more output for pipeline --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 79f107ef..71c75e4b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,6 +47,6 @@ jobs: - name: Check for Uncommitted Changes run: | - git diff --quiet || (echo "Es gibt Änderungen durch die Pipline. Lokale Sushi Konfiguration prüfen!" && exit 1) + git diff --exit-code || (echo "Es gibt Änderungen durch die Pipline. Lokale Sushi Konfiguration prüfen!" && exit 1) From 48d52f7653ada5d5a394724d3842b575681ddf5e Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 10:44:09 +0100 Subject: [PATCH 07/20] changes from sushi update --- ...eSystem-GEM-ERP-CS-AvailabilityStatus.json | 2 +- .../CodeSystem-GEM-ERP-CS-DocumentType.json | 2 +- .../CodeSystem-GEM-ERP-CS-FlowType.json | 2 +- ...odeSystem-GEM-ERP-CS-OrganizationType.json | 2 +- ...-64d5081e-8d65-11ec-b909-0242ac120002.json | 22 +++++++++---------- ...eDefinition-GEM-ERP-PAR-OUT-OP-Accept.json | 6 ----- ...ctureDefinition-GEM-ERP-PR-AuditEvent.json | 10 --------- ...reDefinition-GEM-ERP-PR-BfArMApproval.json | 10 --------- ...StructureDefinition-GEM-ERP-PR-Binary.json | 10 --------- ...StructureDefinition-GEM-ERP-PR-Bundle.json | 10 --------- ...-GEM-ERP-PR-CloseOperationInputBundle.json | 10 --------- ...tion-GEM-ERP-PR-Communication-DispReq.json | 10 --------- ...tion-GEM-ERP-PR-Communication-InfoReq.json | 10 --------- ...nition-GEM-ERP-PR-Communication-Reply.json | 10 --------- ...M-ERP-PR-Communication-Representative.json | 10 --------- ...tureDefinition-GEM-ERP-PR-Composition.json | 10 --------- ...StructureDefinition-GEM-ERP-PR-Device.json | 10 --------- ...StructureDefinition-GEM-ERP-PR-Digest.json | 10 --------- ...inition-GEM-ERP-PR-MedicationDispense.json | 10 --------- .../StructureDefinition-GEM-ERP-PR-Task.json | 10 --------- ...alueSet-GEM-ERP-VS-AvailabilityStatus.json | 2 +- .../ValueSet-GEM-ERP-VS-DocumentType.json | 2 +- .../ValueSet-GEM-ERP-VS-FlowType.json | 2 +- .../ValueSet-GEM-ERP-VS-OrganizationType.json | 2 +- .../ValueSet-GEM-ERP-VS-PerformerType.json | 2 +- 25 files changed, 20 insertions(+), 166 deletions(-) diff --git a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-AvailabilityStatus.json b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-AvailabilityStatus.json index 6d4a47f6..8439378a 100644 --- a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-AvailabilityStatus.json +++ b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-AvailabilityStatus.json @@ -6,7 +6,6 @@ "id": "GEM-ERP-CS-AvailabilityStatus", "title": "CodeSystem of AvailabilityStatus", "description": "Type of the availability status for medication availability request.", - "version": "1.2", "url": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_AvailabilityStatus", "concept": [ { @@ -34,6 +33,7 @@ "display": "unbekannt" } ], + "version": "1.2", "publisher": "gematik GmbH", "contact": [ { diff --git a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-DocumentType.json b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-DocumentType.json index 648cd683..ff7a7c40 100644 --- a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-DocumentType.json +++ b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-DocumentType.json @@ -6,7 +6,6 @@ "id": "GEM-ERP-CS-DocumentType", "title": "CodeSystem of Documenttypes", "description": "Type of document depending on the recipient of the Bundle.", - "version": "1.2", "url": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType", "concept": [ { @@ -22,6 +21,7 @@ "display": "Receipt" } ], + "version": "1.2", "publisher": "gematik GmbH", "contact": [ { diff --git a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-FlowType.json b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-FlowType.json index 6daedb3b..155b79a3 100644 --- a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-FlowType.json +++ b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-FlowType.json @@ -6,7 +6,6 @@ "id": "GEM-ERP-CS-FlowType", "title": "CodeSystem of Flowtypes", "description": "Shows the different types of the ePrescription according to the prescription forms.", - "version": "1.2", "url": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_FlowType", "concept": [ { @@ -46,6 +45,7 @@ "display": "reserviert für Pharmazeutische Dienstleistungen bzw. Impfungen durch Apotheker" } ], + "version": "1.2", "publisher": "gematik GmbH", "contact": [ { diff --git a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-OrganizationType.json b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-OrganizationType.json index 6f30d95c..f8342d25 100644 --- a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-OrganizationType.json +++ b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-OrganizationType.json @@ -6,7 +6,6 @@ "id": "GEM-ERP-CS-OrganizationType", "title": "CodeSystem of Organizationtype Codes", "description": "Type of Organiziation where to get e-prescriptions dispensed", - "version": "1.2", "url": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_OrganizationType", "concept": [ { @@ -14,6 +13,7 @@ "display": "Öffentliche Apotheke" } ], + "version": "1.2", "publisher": "gematik GmbH", "contact": [ { diff --git a/Resources/fsh-generated/resources/Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json b/Resources/fsh-generated/resources/Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json index 2f6ae213..431aa703 100644 --- a/Resources/fsh-generated/resources/Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json +++ b/Resources/fsh-generated/resources/Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json @@ -6,6 +6,17 @@ "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_BfArMApproval|1.2" ] }, + "entity": [ + { + "role": "source", + "what": { + "identifier": { + "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId", + "value": "165.100.000.000.024.67" + } + } + } + ], "agent": [ { "type": { @@ -27,17 +38,6 @@ } } ], - "entity": [ - { - "role": "source", - "what": { - "identifier": { - "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId", - "value": "165.100.000.000.024.67" - } - } - } - ], "signature": [ { "type": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PAR-OUT-OP-Accept.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PAR-OUT-OP-Accept.json index a64fdfae..35e782cd 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PAR-OUT-OP-Accept.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PAR-OUT-OP-Accept.json @@ -1,12 +1,6 @@ { "resourceType": "StructureDefinition", "id": "GEM-ERP-PAR-OUT-OP-Accept", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Foundation.Other" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PAR_OUT_OP_Accept", "version": "1.2", "name": "GEM_ERP_PAR_OUT_OP_Accept", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json index cd9f4eef..2159b435 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json @@ -4,16 +4,6 @@ "meta": { "lastUpdated": "2020-04-16T13:41:55.87+00:00" }, - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Foundation.Security" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "not-classified" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_AuditEvent", "version": "1.2", "name": "GEM_ERP_PR_AuditEvent", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-BfArMApproval.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-BfArMApproval.json index 50e96786..dda62124 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-BfArMApproval.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-BfArMApproval.json @@ -1,16 +1,6 @@ { "resourceType": "StructureDefinition", "id": "GEM-ERP-PR-BfArMApproval", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Foundation.Security" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "not-classified" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_BfArMApproval", "version": "1.2", "name": "GEM_ERP_PR_BfArMApproval", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Binary.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Binary.json index 976daee6..e6c249b5 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Binary.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Binary.json @@ -1,16 +1,6 @@ { "resourceType": "StructureDefinition", "id": "GEM-ERP-PR-Binary", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Foundation.Other" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "not-classified" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Binary", "version": "1.2", "name": "GEM_ERP_PR_Binary", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Bundle.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Bundle.json index 4222b089..0e4ba274 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Bundle.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Bundle.json @@ -1,16 +1,6 @@ { "resourceType": "StructureDefinition", "id": "GEM-ERP-PR-Bundle", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Foundation.Other" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "not-classified" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Bundle", "version": "1.2", "name": "GEM_ERP_PR_Bundle", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-CloseOperationInputBundle.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-CloseOperationInputBundle.json index 1b34ec2d..774d11d9 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-CloseOperationInputBundle.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-CloseOperationInputBundle.json @@ -1,16 +1,6 @@ { "resourceType": "StructureDefinition", "id": "GEM-ERP-PR-CloseOperationInputBundle", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Foundation.Other" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "not-classified" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_CloseOperationInputBundle", "version": "1.2", "name": "GEM_ERP_PR_CloseOperationInputBundle", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json index ef57b7ae..c1d4be1f 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json @@ -4,16 +4,6 @@ "meta": { "lastUpdated": "2020-04-16T13:43:30.128+00:00" }, - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Clinical.Request & Response" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "patient" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Communication_DispReq", "version": "1.2", "name": "GEM_ERP_PR_Communication_DispReq", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json index 377be1b0..4477309d 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json @@ -4,16 +4,6 @@ "meta": { "lastUpdated": "2020-04-16T13:43:30.128+00:00" }, - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Clinical.Request & Response" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "patient" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Communication_InfoReq", "version": "1.2", "name": "GEM_ERP_PR_Communication_InfoReq", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json index 526b0cf4..6782c728 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json @@ -4,16 +4,6 @@ "meta": { "lastUpdated": "2020-04-16T13:43:30.128+00:00" }, - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Clinical.Request & Response" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "patient" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Communication_Reply", "version": "1.2", "name": "GEM_ERP_PR_Communication_Reply", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json index 262e6cbb..9940f7a5 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json @@ -4,16 +4,6 @@ "meta": { "lastUpdated": "2020-04-16T13:43:30.128+00:00" }, - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Clinical.Request & Response" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "patient" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Communication_Representative", "version": "1.2", "name": "GEM_ERP_PR_Communication_Representative", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Composition.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Composition.json index 4377236d..1f8131fc 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Composition.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Composition.json @@ -4,16 +4,6 @@ "meta": { "lastUpdated": "2020-04-16T13:43:58.4+00:00" }, - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Foundation.Documents" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "not-classified" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Composition", "version": "1.2", "name": "GEM_ERP_PR_Composition", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Device.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Device.json index afab9631..dd2d66c4 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Device.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Device.json @@ -1,16 +1,6 @@ { "resourceType": "StructureDefinition", "id": "GEM-ERP-PR-Device", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Base.Entities" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "business" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Device", "version": "1.2", "name": "GEM_ERP_PR_Device", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Digest.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Digest.json index 908d18a9..14cecc71 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Digest.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Digest.json @@ -1,16 +1,6 @@ { "resourceType": "StructureDefinition", "id": "GEM-ERP-PR-Digest", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Foundation.Other" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "not-classified" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Digest", "version": "1.2", "name": "GEM_ERP_PR_Digest", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json index 045e0c2a..2e438b92 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json @@ -4,16 +4,6 @@ "meta": { "lastUpdated": "2020-04-16T13:44:27.957+00:00" }, - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Clinical.Medications" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "patient" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_MedicationDispense", "version": "1.2", "name": "GEM_ERP_PR_MedicationDispense", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json index 5d37b4dd..25630d9c 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json @@ -1,16 +1,6 @@ { "resourceType": "StructureDefinition", "id": "GEM-ERP-PR-Task", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Base.Workflow" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "not-classified" - } - ], "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Task", "version": "1.2", "name": "GEM_ERP_PR_Task", diff --git a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-AvailabilityStatus.json b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-AvailabilityStatus.json index 4bbfb56f..beac5ce4 100644 --- a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-AvailabilityStatus.json +++ b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-AvailabilityStatus.json @@ -5,8 +5,8 @@ "id": "GEM-ERP-VS-AvailabilityStatus", "title": "ValueSet of AvailabilityStatus Codes", "description": "Type of the availability status for medication availability request", - "version": "1.2", "url": "https://gematik.de/fhir/erp/ValueSet/GEM_ERP_VS_AvailabilityStatus", + "version": "1.2", "publisher": "gematik GmbH", "contact": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-DocumentType.json b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-DocumentType.json index b5986c63..a5d101c4 100644 --- a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-DocumentType.json +++ b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-DocumentType.json @@ -5,8 +5,8 @@ "id": "GEM-ERP-VS-DocumentType", "title": "ValueSet of Documenttype Codes", "description": "Type of document depending on the recipient.", - "version": "1.2", "url": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_VS_DocumentType", + "version": "1.2", "publisher": "gematik GmbH", "contact": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-FlowType.json b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-FlowType.json index 64961bee..3204de5d 100644 --- a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-FlowType.json +++ b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-FlowType.json @@ -5,8 +5,8 @@ "id": "GEM-ERP-VS-FlowType", "title": "ValueSet of Flowtype Codes", "description": "Shows the different types of the ePrescription according to the prescription forms.", - "version": "1.2", "url": "https://gematik.de/fhir/erp/ValueSet/GEM_ERP_VS_FlowType", + "version": "1.2", "publisher": "gematik GmbH", "contact": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-OrganizationType.json b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-OrganizationType.json index 0ef83e14..3226bf46 100644 --- a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-OrganizationType.json +++ b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-OrganizationType.json @@ -5,8 +5,8 @@ "id": "GEM-ERP-VS-OrganizationType", "title": "ValueSet of Organizationtype Codes", "description": "Type of Organiziation", - "version": "1.2", "url": "https://gematik.de/fhir/erp/ValueSet/GEM_ERP_VS_OrganizationType", + "version": "1.2", "publisher": "gematik GmbH", "contact": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-PerformerType.json b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-PerformerType.json index 007cf1a4..00159d9b 100644 --- a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-PerformerType.json +++ b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-PerformerType.json @@ -5,8 +5,8 @@ "id": "GEM-ERP-VS-PerformerType", "title": "ValueSet of Performertype Codes", "description": "Type of performer", - "version": "1.2", "url": "https://gematik.de/fhir/erp/ValueSet/GEM_ERP_VS_PerformerType", + "version": "1.2", "publisher": "gematik GmbH", "contact": [ { From a553d3147a0a3435d97212bbe233f24da0a16306 Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 10:51:54 +0100 Subject: [PATCH 08/20] Update Firely Terminal Version --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 71c75e4b..44884002 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,6 +32,7 @@ jobs: uses: FirelyTeam/firely-terminal-pipeline@v0.4.0 with: PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/ + FIRELY_TERMINAL_VERSION: 3.1.0 #PATH_TO_EXAMPLES: Examples #PATH_TO_QUALITY_CONTROL_RULES: qc/custom DOTNET_VALIDATION_ENABLED: true From bc9501aab47b9fe7d0295ad1896f0999c56dc9b2 Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 10:57:19 +0100 Subject: [PATCH 09/20] Set Java Validator version --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 44884002..44d04617 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,6 +39,7 @@ jobs: JAVA_VALIDATION_ENABLED: true OUTPUT_FORMAT: RAW JAVA_VALIDATION_OPTIONS: -allow-example-urls true + JAVA_VALIDATOR_VERSION: 6.0.11 SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true From 617856fc81c8cb3baccf7df436b33018f751fe53 Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 11:19:20 +0100 Subject: [PATCH 10/20] adapt github action --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 44d04617..b82243ae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,11 +44,11 @@ jobs: SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true SUSHI_VERSION: 3.5.0 - SUSHI_OPTIONS: Resources/ + SUSHI_OPTIONS: Resources/ -l debug EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA - name: Check for Uncommitted Changes run: | - git diff --exit-code || (echo "Es gibt Änderungen durch die Pipline. Lokale Sushi Konfiguration prüfen!" && exit 1) + git diff --exit-code 'Resources/fsh-generated/resources'|| (echo "Es gibt Änderungen durch die Pipeline. Lokale Sushi Konfiguration prüfen!" && exit 1) From 49ae1cbca6980af4b7a872b968a38cf89016d7ed Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 11:25:48 +0100 Subject: [PATCH 11/20] change order of extension --- ...finition-GEM-ERP-EX-SupplyOptionsType.json | 36 +++++++++---------- .../GEM_ERP_EX_SupplyOptionsType.fsh | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-SupplyOptionsType.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-SupplyOptionsType.json index 27546847..2bea329b 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-SupplyOptionsType.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-SupplyOptionsType.json @@ -48,28 +48,28 @@ "min": 3 }, { - "id": "Extension.extension:onPremise", + "id": "Extension.extension:delivery", "path": "Extension.extension", - "sliceName": "onPremise", - "short": "dispensation is offered/preferred on premise", - "definition": "Patient or pharmacy may state their preferred or offered supply option to pick up medications on Premise", + "sliceName": "delivery", + "short": "dispensation is offered/preferred by messenger", + "definition": "Patient or pharmacy may state their preferred or offered supply option to deliver medication by messenger", "min": 1, "max": "1" }, { - "id": "Extension.extension:onPremise.extension", + "id": "Extension.extension:delivery.extension", "path": "Extension.extension.extension", "max": "0" }, { - "id": "Extension.extension:onPremise.url", + "id": "Extension.extension:delivery.url", "path": "Extension.extension.url", - "fixedUri": "onPremise" + "fixedUri": "delivery" }, { - "id": "Extension.extension:onPremise.value[x]", + "id": "Extension.extension:delivery.value[x]", "path": "Extension.extension.value[x]", - "short": "true = pick up on premise accepted/offered", + "short": "true = delivery by messenger accepted/offered", "type": [ { "code": "boolean" @@ -77,28 +77,28 @@ ] }, { - "id": "Extension.extension:delivery", + "id": "Extension.extension:onPremise", "path": "Extension.extension", - "sliceName": "delivery", - "short": "dispensation is offered/preferred by messenger", - "definition": "Patient or pharmacy may state their preferred or offered supply option to deliver medication by messenger", + "sliceName": "onPremise", + "short": "dispensation is offered/preferred on premise", + "definition": "Patient or pharmacy may state their preferred or offered supply option to pick up medications on Premise", "min": 1, "max": "1" }, { - "id": "Extension.extension:delivery.extension", + "id": "Extension.extension:onPremise.extension", "path": "Extension.extension.extension", "max": "0" }, { - "id": "Extension.extension:delivery.url", + "id": "Extension.extension:onPremise.url", "path": "Extension.extension.url", - "fixedUri": "delivery" + "fixedUri": "onPremise" }, { - "id": "Extension.extension:delivery.value[x]", + "id": "Extension.extension:onPremise.value[x]", "path": "Extension.extension.value[x]", - "short": "true = delivery by messenger accepted/offered", + "short": "true = pick up on premise accepted/offered", "type": [ { "code": "boolean" diff --git a/Resources/input/fsh/extensions/GEM_ERP_EX_SupplyOptionsType.fsh b/Resources/input/fsh/extensions/GEM_ERP_EX_SupplyOptionsType.fsh index ce464f75..c38d7697 100644 --- a/Resources/input/fsh/extensions/GEM_ERP_EX_SupplyOptionsType.fsh +++ b/Resources/input/fsh/extensions/GEM_ERP_EX_SupplyOptionsType.fsh @@ -11,8 +11,8 @@ Id: GEM-ERP-EX-SupplyOptionsType * extension ^slicing.discriminator.path = "url" * extension ^slicing.rules = #closed * extension contains - onPremise 1..1 and delivery 1..1 and + onPremise 1..1 and shipment 1..1 * extension[onPremise] ^short = "dispensation is offered/preferred on premise" * extension[onPremise] ^definition = "Patient or pharmacy may state their preferred or offered supply option to pick up medications on Premise" From cebd7cf8074c669e9f4ea2579f85d534dadd14e6 Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 12:24:05 +0100 Subject: [PATCH 12/20] set sushi version down --- .github/workflows/main.yml | 4 ++-- Resources/sushi-config.yaml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b82243ae..ac49e060 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,8 +43,8 @@ jobs: SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true - SUSHI_VERSION: 3.5.0 - SUSHI_OPTIONS: Resources/ -l debug + SUSHI_VERSION: 3.3.3 + SUSHI_OPTIONS: Resources/ EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA - name: Check for Uncommitted Changes diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index 2b5241c3..9abe5471 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -7,8 +7,7 @@ fhirVersion: 4.0.1 FSHOnly: true applyExtensionMetadataToRoot: false -status: draft -version: "1.2.1" +version: "1.2" publisher: name: Gematik GmbH url: https://www.gematik.de/ From f5040a46a0200285f4c1e523f07d7b1f59472249 Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 12:27:39 +0100 Subject: [PATCH 13/20] change sushi version to 3.0.0 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ac49e060..83859d50 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,7 @@ jobs: SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true - SUSHI_VERSION: 3.3.3 + SUSHI_VERSION: 3.0.0 SUSHI_OPTIONS: Resources/ EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA From 35c343a942c3abfc18160edf240ee94251858dd5 Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 12:40:50 +0100 Subject: [PATCH 14/20] change operating system to macos latest --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 83859d50..b17a4838 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: # Validate all resources using Firely Terminal CI_FHIR_VALIDATION: # The type of runner that the job will run on - runs-on: ubuntu-latest + runs-on: macos-latest # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -43,7 +43,7 @@ jobs: SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true - SUSHI_VERSION: 3.0.0 + SUSHI_VERSION: 3.5.0 SUSHI_OPTIONS: Resources/ EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA From 82d32aa6da2963853bb9e0f7b9112d3777c0ad6b Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 12:46:04 +0100 Subject: [PATCH 15/20] add step to set rights --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b17a4838..28d0a4b9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,6 +25,9 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 + + - name: Set rights + run: sudo chown -R $USER "/Users/runner/.npm" # Java and .NET are already installed on ubuntu-latest From 8b109b383a5f42a339ba9e6d091d5d1daff8c038 Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 12:49:38 +0100 Subject: [PATCH 16/20] next try for rights --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 28d0a4b9..7c4f6b3e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v2 - name: Set rights - run: sudo chown -R $USER "/Users/runner/.npm" + run: sudo chown -R 501:20 "/Users/runner/.npm" # Java and .NET are already installed on ubuntu-latest From 40e407709f074ecc5e91d5fa010a7d147b0de961 Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 13:26:50 +0100 Subject: [PATCH 17/20] edit github action --- .github/workflows/main.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7c4f6b3e..b0260238 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,13 +23,23 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Set rights - run: sudo chown -R 501:20 "/Users/runner/.npm" + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 + with: + node-version: '16' - # Java and .NET are already installed on ubuntu-latest + # Install .NET runtime + - name: Setup .NET Core SDK + uses: actions/setup-dotnet@v2 + with: + dotnet-version: 6.0.x + + # Install Java runtime (only needed if you want to run the offical HL7 Java validator) + - name: Setup Java JDK + uses: actions/setup-java@v3 + with: + distribution: 'microsoft' + java-version: '17' - name: Firely.Terminal (GitHub Actions) uses: FirelyTeam/firely-terminal-pipeline@v0.4.0 From ada95633226b1ab500b94c9e214170f440d67abe Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 13:44:48 +0100 Subject: [PATCH 18/20] update macos on girhub runner --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b0260238..682143ad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: # Validate all resources using Firely Terminal CI_FHIR_VALIDATION: # The type of runner that the job will run on - runs-on: macos-latest + runs-on: macos-13 # Steps represent a sequence of tasks that will be executed as part of the job steps: From 235d3be13e192d2850c19375f6fe54f946b515cb Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 13:48:42 +0100 Subject: [PATCH 19/20] add apt-get to run --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 682143ad..f7b6f9f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,6 +27,11 @@ jobs: - uses: actions/setup-node@v3 with: node-version: '16' + + - name: Install or update apt-get + run: | + sudo apt-get update + sudo apt-get install libcurl4-openssl-dev # Install .NET runtime - name: Setup .NET Core SDK From df6d5080f0bdc5034f1b8e2f42b80345fc01cdc6 Mon Sep 17 00:00:00 2001 From: Florian Schoffke Date: Tue, 28 Nov 2023 13:52:35 +0100 Subject: [PATCH 20/20] change base image back to ubuntu --- .github/workflows/main.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f7b6f9f0..35e9e7c2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,19 +19,14 @@ jobs: # Validate all resources using Firely Terminal CI_FHIR_VALIDATION: # The type of runner that the job will run on - runs-on: macos-13 + runs-on: ubuntu-latest # Steps represent a sequence of tasks that will be executed as part of the job steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: - node-version: '16' - - - name: Install or update apt-get - run: | - sudo apt-get update - sudo apt-get install libcurl4-openssl-dev + node-version: '20' # Install .NET runtime - name: Setup .NET Core SDK