Require explicit FHIR versions in the harness + Add R4B support

.github/workflows/ci-r4b.yml

@@ -0,0 +1,86 @@
+name: CI R4B
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+
+jobs:
+  build:
+    if: github.repository == 'incendilabs/plan-executor'
+
+    runs-on: ubuntu-24.04
+    steps:
+      -
+        name: Checkout plan-executor
+        uses: actions/checkout@v7
+      -
+        name: Build plan-executor Docker image
+        run: docker build -t incendi/plan_executor:latest .
+      -
+        name: Checkout Spark
+        uses: actions/checkout@v7
+        with:
+          repository: FirelyTeam/spark
+          ref: master
+          path: spark
+      -
+        name: Build Spark R4B Docker image
+        run: docker build spark --file spark/.docker/linux/Spark.R4B.Dockerfile
+          --tag sparkfhir/spark:r4b-latest
+      -
+        name: Build Mongo R4B Docker image
+        run: docker build spark --file spark/.docker/linux/Mongo.R4B.Dockerfile
+          --tag sparkfhir/mongo:r4b-latest
+      -
+        name: Run tests
+        run: |
+          mkdir -p logs html_summaries json_results
+          docker compose -f docker-compose.yml -f docker-compose-r4b.yml up -d spark
+          docker compose -f docker-compose.yml -f docker-compose-r4b.yml run --rm --no-deps plan_executor ./execute_all.sh 'http://spark:8080/fhir' r4b 'html|json|stdout'
+          docker compose -f docker-compose.yml -f docker-compose-r4b.yml logs spark > logs/backend.log
+      -
+        name: Combine test results
+        if: ${{ always() }}
+        run: ./combine-test-results.sh json_results annotations.json
+      -
+        name: Attach test results
+        if: github.event_name != 'pull_request'
+        uses: yuzutech/annotations-action@v0.6.0
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          input: annotations.json
+      -
+        name: Archive logs
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: logs-r4b-${{ github.sha }}
+          path: logs/*.log*
+      -
+        name: Archive test reports
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: html_summaries-r4b-${{ github.sha }}
+          path: html_summaries/**/*.html
+      -
+        name: Archive JSON results
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: json_results-r4b-${{ github.sha }}
+          path: json_results/**/*.json
+      -
+        name: Archive annotations file
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: annotations-r4b-${{ github.sha }}
+          path: annotations.json
+      -
+        name: Cleanup
+        if: ${{ always() }}
+        run: docker compose -f docker-compose.yml -f docker-compose-r4b.yml down

.github/workflows/ci-stu3.yml

@@ -14,18 +14,33 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       -
-        name: Checkout repo
+        name: Checkout plan-executor
         uses: actions/checkout@v7
       -
-        name: Build docker image
+        name: Build plan-executor Docker image
         run: docker build -t incendi/plan_executor:latest .
+      -
+        name: Checkout Spark
+        uses: actions/checkout@v7
+        with:
+          repository: FirelyTeam/spark
+          ref: master
+          path: spark
+      -
+        name: Build Spark STU3 Docker image
+        run: docker build spark --file spark/.docker/linux/Spark.STU3.Dockerfile
+          --tag sparkfhir/spark:stu3-latest
+      -
+        name: Build Mongo STU3 Docker image
+        run: docker build spark --file spark/.docker/linux/Mongo.STU3.Dockerfile
+          --tag sparkfhir/mongo:stu3-latest
       -
         name: Run tests
         run: |
           mkdir -p logs html_summaries json_results
           docker compose -f docker-compose-stu3.yml up -d spark
-          docker compose run --rm --no-deps plan_executor ./execute_all.sh 'http://spark:8080/fhir' stu3 'html|json|stdout'
-          docker compose logs spark > logs/backend.log
+          docker compose -f docker-compose-stu3.yml run --rm --no-deps plan_executor ./execute_all.sh 'http://spark:8080/fhir' stu3 'html|json|stdout'
+          docker compose -f docker-compose-stu3.yml logs spark > logs/backend.log
       -
         name: Combine test results
         if: ${{ always() }}
@@ -42,30 +57,30 @@ jobs:
         if: ${{ always() }}
         uses: actions/upload-artifact@v7
         with:
-          name: logs-r4-${{ github.sha }}
+          name: logs-stu3-${{ github.sha }}
           path: logs/*.log*
       -
         name: Archive test reports
         if: ${{ always() }}
         uses: actions/upload-artifact@v7
         with:
-          name: html_summaries-r4-${{ github.sha }}
+          name: html_summaries-stu3-${{ github.sha }}
           path: html_summaries/**/*.html
       -
         name: Archive JSON results
         if: ${{ always() }}
         uses: actions/upload-artifact@v7
         with:
-          name: json_results-r4-${{ github.sha }}
+          name: json_results-stu3-${{ github.sha }}
           path: json_results/**/*.json
       -
         name: Archive annotations file
         if: ${{ always() }}
         uses: actions/upload-artifact@v7
         with:
-          name: annotations-r4-${{ github.sha }}
+          name: annotations-stu3-${{ github.sha }}
           path: annotations.json
       -
         name: Cleanup
         if: ${{ always() }}
-        run: docker compose down
+        run: docker compose -f docker-compose-stu3.yml down

.github/workflows/ci.yml

@@ -14,11 +14,26 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       -
-        name: Checkout repo
+        name: Checkout plan-executor
         uses: actions/checkout@v7
       -
-        name: Build docker image
+        name: Build plan-executor Docker image
         run: docker build -t incendi/plan_executor:latest .
+      -
+        name: Checkout Spark
+        uses: actions/checkout@v7
+        with:
+          repository: FirelyTeam/spark
+          ref: master
+          path: spark
+      -
+        name: Build Spark R4 Docker image
+        run: docker build spark --file spark/.docker/linux/Spark.R4.Dockerfile
+          --tag sparkfhir/spark:r4-latest
+      -
+        name: Build Mongo R4 Docker image
+        run: docker build spark --file spark/.docker/linux/Mongo.R4.Dockerfile
+          --tag sparkfhir/mongo:r4-latest
       -
         name: Run tests
         run: |
@@ -68,4 +83,4 @@ jobs:
       -
         name: Cleanup
         if: ${{ always() }}
-        run: docker compose down
+        run: docker compose down

Gemfile

@@ -2,8 +2,8 @@ source "https://rubygems.org"
 
 gem 'fhir_dstu2_models', git: 'https://github.com/incendilabs/fhir_dstu2_models.git'
 gem 'fhir_stu3_models', git: 'https://github.com/incendilabs/fhir_stu3_models.git'
-gem 'fhir_client', git: 'https://github.com/incendilabs/fhir_client.git'
-gem 'fhir_models', '~> 4.1'
+gem 'fhir_client', git: 'https://github.com/incendilabs/fhir_client.git', branch: 'master'
+gem 'fhir_models', git: 'https://github.com/incendilabs/fhir_models.git', branch: 'master'
 gem 'activesupport', '>= 6'
 gem 'pry', '~> 0.15.0'
 gemspec

Gemfile.lock

@@ -1,8 +1,9 @@
 GIT
   remote: https://github.com/incendilabs/fhir_client.git
-  revision: a2298086b051f18595dcfe5768f63545f2a271bb
+  revision: 79026641f9b2ac7cf30bc27a3528e505d34c67e8
+  branch: master
   specs:
-    fhir_client (4.0.4)
+    fhir_client (5.0.0)
       activesupport (>= 3)
       addressable (>= 2.9.0)
       fhir_dstu2_models (>= 1.0.10)
@@ -24,6 +25,17 @@ GIT
       mime-types (>= 3.0)
       nokogiri (>= 1.10.4)
 
+GIT
+  remote: https://github.com/incendilabs/fhir_models.git
+  revision: a143d2e21d0253b33fdaeb17e2d152ad656c9a3e
+  branch: master
+  specs:
+    fhir_models (4.1.0)
+      bcp47 (>= 0.3)
+      date_time_precision (>= 0.8)
+      mime-types (>= 3.0)
+      nokogiri (>= 1.10.4)
+
 GIT
   remote: https://github.com/incendilabs/fhir_stu3_models.git
   revision: 71db01196b6cafe2310498135849cae356fe6f44
@@ -90,11 +102,6 @@ GEM
       logger
     faraday-net_http (3.4.4)
       net-http (~> 0.5)
-    fhir_models (4.3.0)
-      bcp47 (>= 0.3)
-      date_time_precision (>= 0.8)
-      mime-types (>= 3.0)
-      nokogiri (>= 1.11.4)
     hashdiff (1.2.1)
     http-accept (1.7.0)
     http-cookie (1.1.4)
@@ -182,7 +189,7 @@ DEPENDENCIES
   awesome_print
   fhir_client!
   fhir_dstu2_models!
-  fhir_models (~> 4.1)
+  fhir_models!
   fhir_stu3_models!
   plan_executor!
   pry (~> 0.15.0)