Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into HAPI-7.0.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	Dockerfile
#	pom.xml
#	src/main/resources/manifest.json
  • Loading branch information
KevinMayfield committed Mar 15, 2024
2 parents fcd7b78 + c9146d8 commit 8a80f56
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 0 deletions.
21 changes: 21 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Basic `dependabot.yml` file with
# minimum configuration for two package managers

version: 2
updates:
# Enable version updates for npm
- package-ecosystem: "maven"
# Look for `pom.xml` in the `root` directory
directory: "/"
# Check for updates once a week
schedule:
interval: "weekly"

# Enable version updates for Docker
- package-ecosystem: "docker"
# Look for a `Dockerfile` in the `root` directory
directory: "/"
# Check for updates once a week
schedule:
interval: "weekly"

45 changes: 45 additions & 0 deletions .github/workflows/test-validation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: FHIR-Validation-Test

# This workflow is used to test any updates to the validation-service repo

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
# Allows you to run this workflow manually from the Actions tab
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@v4
with:
submodules: true

- name: Check out IOPS-FHIR-Test-Scripts
uses: actions/checkout@master
with:
repository: NHSDigital/IOPS-FHIR-Test-Scripts
ref: main
path: IOPS-FHIR-Test-Scripts

- name: Install npm
run: cd IOPS-FHIR-Test-Scripts ; npm ci

- name: Update FHIR Validator build
run: mvn clean package

- name: Run FHIR Validator
run:
nohup java -jar ./target/fhir-validator.jar --terminology.url=https://ontology.nhs.uk/production1/fhir --terminology.authorization.tokenUrl=https://ontology.nhs.uk/authorisation/auth/realms/nhs-digital-terminology/protocol/openid-connect/token --terminology.authorization.clientId=${{ secrets.ONTO_CLIENT_ID }} --terminology.authorization.clientSecret=${{ secrets.ONTO_CLIENT_SECRET }} &
sleep 120

- name: Run Test
run: cd IOPS-FHIR-Test-Scripts; npm run integration-test
8 changes: 8 additions & 0 deletions src/main/resources/manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
[
{
"packageName": "fhir.r4.ukcore.stu3.currentbuild",
"version": "0.0.8-pre-release"
},
{
"packageName": "hl7.fhir.uv.sdc",
"version": "3.0.0"
},
{
"packageName": "fhir.r4.nhsengland.stu1",
"version": "1.1.0"
Expand Down

0 comments on commit 8a80f56

Please sign in to comment.