From 9bb939a9be129cfdafbc3163755038716358074a Mon Sep 17 00:00:00 2001 From: Julian Sass Date: Mon, 13 Nov 2023 14:22:54 +0100 Subject: [PATCH 1/3] Updated gh action and qc rules --- .github/workflows/main.yml | 9 ++++----- qc/custom.rules.yaml | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 50bf8b6..588e5e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Java and .NET are already installed on ubuntu-latest @@ -37,11 +37,10 @@ jobs: PATH_TO_QUALITY_CONTROL_RULES: qc/custom DOTNET_VALIDATION_ENABLED: true JAVA_VALIDATION_ENABLED: true + #The Coding provided (http://fhir.de/CodeSystem/bfarm/ops#5-470) is not in the value set 'OpsVS' (http://fhir.de/ValueSet/bfarm/ops|1.4.0), and a code is required from this value set. + EXPECTED_FAILS: VALIDATION_EXAMPLES_JAVA OUTPUT_FORMAT: RAW - JAVA_VALIDATION_OPTIONS: -allow-example-urls true + JAVA_VALIDATION_OPTIONS: -allow-example-urls true -tx n/a SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} JAVA_VALIDATOR_VERSION: 6.2.3 - - #The Coding provided (http://fhir.de/CodeSystem/bfarm/ops#5-470) is not in the value set 'OpsVS' (http://fhir.de/ValueSet/bfarm/ops|1.4.0), and a code is required from this value set. - EXPECTED_FAILS: VALIDATION_EXAMPLES_JAVA \ No newline at end of file diff --git a/qc/custom.rules.yaml b/qc/custom.rules.yaml index cf47c8b..356c94c 100644 --- a/qc/custom.rules.yaml +++ b/qc/custom.rules.yaml @@ -1,5 +1,21 @@ -- include: recommended - name: include-recommended +# This is the minimal rule series +# removed 'action: unique' due to multiple versions of OPS CodeSystem + +- action: parse + name: parse-fhir-resources + status: "Checking if all FHIR Resource files can be parsed" + files: + - /**/*.xml + - /**/*.json + - "!package.json" + +- name: resource-validation + status: "Validating resources against the FHIR standard and their profiles" + action: validate + category: Resource + suppress: + - 6005 + - eld-16 - name: version-filled filter: (StructureDefinition or ValueSet or CodeSystem or ConceptMap or StructureMap or NamingSystem or SearchParameter or CapabilityStatement or OperationDefinition or ImplementationGuide).exists() From 730ad2611ba22c81a216450d6451bca853f345ee Mon Sep 17 00:00:00 2001 From: Julian Sass Date: Mon, 13 Nov 2023 14:34:55 +0100 Subject: [PATCH 2/3] Updated gh action and qc rules --- qc/custom.rules.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/qc/custom.rules.yaml b/qc/custom.rules.yaml index 356c94c..08186bf 100644 --- a/qc/custom.rules.yaml +++ b/qc/custom.rules.yaml @@ -8,6 +8,7 @@ - /**/*.xml - /**/*.json - "!package.json" + - "!fhirpkg.lock.json" - name: resource-validation status: "Validating resources against the FHIR standard and their profiles" From 29f1a07633a0dbc123b957b0865a7481bbc42fcc Mon Sep 17 00:00:00 2001 From: Julian Sass Date: Mon, 13 Nov 2023 14:48:52 +0100 Subject: [PATCH 3/3] Updated gh action and qc rules --- .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 588e5e7..755d846 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: DOTNET_VALIDATION_ENABLED: true JAVA_VALIDATION_ENABLED: true #The Coding provided (http://fhir.de/CodeSystem/bfarm/ops#5-470) is not in the value set 'OpsVS' (http://fhir.de/ValueSet/bfarm/ops|1.4.0), and a code is required from this value set. - EXPECTED_FAILS: VALIDATION_EXAMPLES_JAVA + EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA OUTPUT_FORMAT: RAW JAVA_VALIDATION_OPTIONS: -allow-example-urls true -tx n/a SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }}