diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index bfeb283c..00000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,54 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Firely Validation - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events but only for the master branch - # mf - extend to develop & feature branches - # mf - commented out and left to manual trigger to test - # push: - # branches: [ master, main, develop, feature/* ] - # pull_request: - # branches: [ master, main ] - - # Allows you to run this workflow manually from the Actions tab - # mf - added develop & feature/* branches in manual trigger to test - workflow_dispatch: - branches: [ master, main, develop, feature/* ] - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - - # Validate all resources using Firely Terminal - CI_FHIR_VALIDATION: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - - name: Checkout code - uses: actions/checkout@v2 - - # Install .NET runtime - - name: Setup .NET Core SDK - uses: actions/setup-dotnet@v1.7.2 - with: - dotnet-version: 3.1.x - - # Install Java runtime (only needed if you want to run the offical HL7 Java validator) - - name: Setup Java JDK - uses: actions/setup-java@v1.4.3 - with: - java-version: 1.8 - - - name: Firely.Terminal (GitHub Actions) - uses: FirelyTeam/firely-terminal-pipeline@v0.2.1 - with: - SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} - SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} - PATH_TO_CONFORMANCE_RESOURCES: codesystems conceptmaps structuredefinitions valuesets - PATH_TO_EXAMPLES: examples - DOTNET_VALIDATION_ENABLED: true - JAVA_VALIDATION_ENABLED: true - EXPECTED_FAILS: VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA diff --git a/.github/workflows/terminology.yml b/.github/workflows/terminology.yml deleted file mode 100644 index eb43eec7..00000000 --- a/.github/workflows/terminology.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: IOPS-FHIR-Validation-call - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the master branch - # Allows you to run this workflow manually from the Actions tab - - push: - - workflow_dispatch: - - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "call-workflow" which references the FHIR validator repo - call-workflow: - uses: NHSDigital/IOPS-FHIR-Test-Scripts/.github/workflows/masterfhirvalidation.yml@main - secrets: - ONTO_CLIENT_ID: ${{ secrets.ONTO_CLIENT_ID }} - ONTO_CLIENT_SECRET: ${{ secrets.ONTO_CLIENT_SECRET }} diff --git a/.github/workflows/validation-no-terminology.yml b/.github/workflows/validation-no-terminology.yml deleted file mode 100644 index 9c7cc33e..00000000 --- a/.github/workflows/validation-no-terminology.yml +++ /dev/null @@ -1,96 +0,0 @@ -name: IOPS-FHIR-Validation-No-Terminology - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the master branch - # Allows you to run this workflow manually from the Actions tab - - push: - - workflow_dispatch: - - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - with: - submodules: true - - - name: Check out IOPS-Validation - uses: actions/checkout@master - with: - repository: NHSDigital/IOPS-Validation - path: validation - - - name: Check out validation-service-fhir-r4 - uses: actions/checkout@master - with: - repository: NHSDigital/validation-service-fhir-r4 - ref: testing - path: validation-service-fhir-r4 - - - name: Install Python 3.8 - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - - name: Upgrade python packaging tools - run: python -m pip install --upgrade pip setuptools wheel - - - name: Install poetry and requests - run: pip install poetry requests - - - name: Install dependencies - run: poetry install - - - name: Set SPEC_VERSION env var - run: echo ::set-env name=SPEC_VERSION::$(poetry run python scripts/calculate_version.py) - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - - - name: Set up JDK 11 - uses: actions/setup-java@v2 - with: - java-version: '11' - distribution: 'adopt' - - - name: Install node - run: | - wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add - - curl -sL https://deb.nodesource.com/setup_13.x | sudo -E bash - - sudo apt-get install -y nodejs - - - name: Cache node modules - uses: actions/cache@v1 - with: - path: ~/.npm - key: ${{ runner.os }}-build-cache-npm-packages-${{ hashFiles('**/package-lock.json') }} - - - name: Install npm - run: make -C validation install - - - name: Configure FHIR Validator - run: make -C validation configure-validation - env: - CI: true - ONTO_CLIENT_ID: ${{ secrets.ONTO_CLIENT_ID }} - ONTO_CLIENT_SECRET: ${{ secrets.ONTO_CLIENT_SECRET }} - - - name: Build FHIR Validator - run: cd validation-service-fhir-r4 && mvn clean package - - - name: Run FHIR Validator - run: - nohup java -jar validation-service-fhir-r4/target/fhir-validator-0.0.1-SNAPSHOT.jar & - sleep 60 - - - name: Run Test - run: make -C validation test diff --git a/examples/UKCore-Bundle-AllergyList-Example.xml b/examples/UKCore-Bundle-AllergyList-Example.xml index b24ed431..1f4e8ee6 100644 --- a/examples/UKCore-Bundle-AllergyList-Example.xml +++ b/examples/UKCore-Bundle-AllergyList-Example.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/UKCore-CareTeam-WeightManagementTeamExample.xml b/examples/UKCore-CareTeam-WeightManagementTeam-Example.xml similarity index 100% rename from examples/UKCore-CareTeam-WeightManagementTeamExample.xml rename to examples/UKCore-CareTeam-WeightManagementTeam-Example.xml diff --git a/examples/UKCore-FamilyMemberHistory-Extension-AssociatedEncounter.xml b/examples/UKCore-FamilyMemberHistory-Extension-AssociatedEncounter-Example.xml similarity index 100% rename from examples/UKCore-FamilyMemberHistory-Extension-AssociatedEncounter.xml rename to examples/UKCore-FamilyMemberHistory-Extension-AssociatedEncounter-Example.xml diff --git a/examples/UKCore-FamilyMemberHistory-Extension-Participant.xml b/examples/UKCore-FamilyMemberHistory-Extension-Participant-Example.xml similarity index 100% rename from examples/UKCore-FamilyMemberHistory-Extension-Participant.xml rename to examples/UKCore-FamilyMemberHistory-Extension-Participant-Example.xml diff --git a/examples/UKCore-FamilyMemberHistory-FatherDiabetes.xml b/examples/UKCore-FamilyMemberHistory-FatherDiabetes-Example.xml similarity index 100% rename from examples/UKCore-FamilyMemberHistory-FatherDiabetes.xml rename to examples/UKCore-FamilyMemberHistory-FatherDiabetes-Example.xml diff --git a/examples/UKCore-MedicationAdministraton-Sn-ZeroDosage-Example.xml b/examples/UKCore-MedicationAdministration-Sn-ZeroDosage-Example.xml similarity index 100% rename from examples/UKCore-MedicationAdministraton-Sn-ZeroDosage-Example.xml rename to examples/UKCore-MedicationAdministration-Sn-ZeroDosage-Example.xml diff --git a/examples/UKCore-MedicationStatement-Extension-MedicationChangeSummary-Example.xml b/examples/UKCore-MedicationStatement-Extension-MedicationChangeSummary-Example.xml index eb5b4e08..9e96b513 100644 --- a/examples/UKCore-MedicationStatement-Extension-MedicationChangeSummary-Example.xml +++ b/examples/UKCore-MedicationStatement-Extension-MedicationChangeSummary-Example.xml @@ -1,6 +1,6 @@ - + diff --git a/examples/UKCore-MedicationStatement-Extension-MedicationPrescribingOrganizationType-Example.xml b/examples/UKCore-MedicationStatement-Extension-PrescribingOrgType-Example.xml similarity index 92% rename from examples/UKCore-MedicationStatement-Extension-MedicationPrescribingOrganizationType-Example.xml rename to examples/UKCore-MedicationStatement-Extension-PrescribingOrgType-Example.xml index 271107db..cd1657f3 100644 --- a/examples/UKCore-MedicationStatement-Extension-MedicationPrescribingOrganizationType-Example.xml +++ b/examples/UKCore-MedicationStatement-Extension-PrescribingOrgType-Example.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/UKCore-Patient-Extension-PreferredDispenserOrganisation-Example.xml b/examples/UKCore-Patient-Extension-PreferredDispenserOrganization-Example.xml similarity index 97% rename from examples/UKCore-Patient-Extension-PreferredDispenserOrganisation-Example.xml rename to examples/UKCore-Patient-Extension-PreferredDispenserOrganization-Example.xml index 89bf2be8..edbe1379 100644 --- a/examples/UKCore-Patient-Extension-PreferredDispenserOrganisation-Example.xml +++ b/examples/UKCore-Patient-Extension-PreferredDispenserOrganization-Example.xml @@ -1,9 +1,9 @@ - - - - - - - - - + + + + + + + + + diff --git a/examples/UKCore-Practitioner-Pharmacist-JimmyChuck-Example.xml b/examples/UKCore-Practitioner-PharmacistJimmyChuck-Example.xml similarity index 96% rename from examples/UKCore-Practitioner-Pharmacist-JimmyChuck-Example.xml rename to examples/UKCore-Practitioner-PharmacistJimmyChuck-Example.xml index 8b8d355b..e291a482 100644 --- a/examples/UKCore-Practitioner-Pharmacist-JimmyChuck-Example.xml +++ b/examples/UKCore-Practitioner-PharmacistJimmyChuck-Example.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - -
- - - - - - -
+ + + + + + + + + + + + + + + + +
+ + + + + + +
\ No newline at end of file diff --git a/examples/UKCore-ServiceRequest-Extension-PriorityReason_SendingAsText-Example.xml b/examples/UKCore-ServiceRequest-Extension-PriorityReason-SendingAsText-Example.xml similarity index 89% rename from examples/UKCore-ServiceRequest-Extension-PriorityReason_SendingAsText-Example.xml rename to examples/UKCore-ServiceRequest-Extension-PriorityReason-SendingAsText-Example.xml index 12b5642d..fad23599 100644 --- a/examples/UKCore-ServiceRequest-Extension-PriorityReason_SendingAsText-Example.xml +++ b/examples/UKCore-ServiceRequest-Extension-PriorityReason-SendingAsText-Example.xml @@ -1,5 +1,5 @@ - +