WIP: V4

.gitattributes

@@ -4,4 +4,5 @@
 /README.md export-ignore
 /output export-ignore
 /input export-ignore
-/phpunit export-ignore
+/phpunit export-ignore
+fhir_test_resources.tar.gz export-ignore

.github/FUNDING.yml

@@ -1,13 +1,2 @@
-# These are supported funding model platforms
-
 github: dcarbone
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: dcarbone
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+ko_fi: dcarbone

.github/actions/bootstrap/action.yaml

@@ -0,0 +1,73 @@
+name: 'Bootstrap'
+description: 'Bootstraps the GHA runner for Builder tests'
+
+inputs:
+  php-version:
+    required: true
+    description: 'PHP version to use for tests'
+
+runs:
+  using: composite
+  steps:
+    - name: 'Define vars'
+      id: vars
+      shell: bash -e {0}
+      # language=sh
+      run: |
+        _phpunit_version=
+        case "${{ inputs.php-version }}" in
+          8.1) _phpunit_version='10.5' ;;
+          8.2) _phpunit_version='11.1' ;;
+          8.3) _phpunit_version='11.1' ;;
+          8.4) _phpunit_version='11.1' ;;
+          *) echo "Unsupported PHP version: ${{ inputs.php-version }}" && exit 1 ;;
+        esac
+        echo "phpunit-version=${_phpunit_version}" >> $GITHUB_OUTPUT
+
+    - name: 'Install PHP'
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ inputs.php-version }}
+        extensions: libxml simplexml json zip
+        ini-values: precision=20
+
+    - name: 'Install jq'
+      uses: dcarbone/install-jq-action@v3
+      with:
+        force: true
+
+    - name: 'Set composer dep versions'
+      shell: bash -e {0}
+      # language=sh
+      run: |
+        tmpf="$(mktemp)"
+        jq -rcM '."require-dev"."phpunit/phpunit" = "^${{ steps.vars.outputs.phpunit-version }}"' composer.json > "${tmpf}"
+        mv "${tmpf}" composer.json
+
+    - name: 'Get composer cache directory'
+      id: composer-cache
+      shell: bash -e {0}
+      # language=sh
+      run: |
+        echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+    - name: 'Init composer dep cache'
+      id: cache
+      uses: actions/cache@v4
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: "composer-${{ runner.os }}-${{ inputs.php-version }}-${{ steps.vars.outputs.phpunit-version }}-${{ hashFiles('composer.lock') }}"
+
+    - name: 'Install composer deps'
+      shell: bash -e {0}
+      # language=sh
+      run: |
+        rm composer.lock
+        composer update --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+    - name: 'Save composer dep cache'
+      if: steps.cache.outputs.cache-hit != 'true' && steps.cache.outputs.cache-hit != true
+      uses: actions/cache/save@v4
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: "composer-${{ runner.os }}-${{ inputs.php-version }}-${{ steps.vars.outputs.phpunit-version }}-${{ hashFiles('composer.lock') }}"

.github/actions/load-fhir-validator/action.yaml

@@ -27,14 +27,14 @@ runs:
         echo 'url=${{ inputs.base-url }}/${{ inputs.version }}/${{ inputs.filename }}' >> $GITHUB_OUTPUT
         echo 'cache-key=fhir-validator-${{ inputs.version }}-2' >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v4
-      id: cache
+    - name: 'Init validator cache'
+      uses: actions/cache@v4
+      id: validator-cache
       with:
         path: |
           ${{ github.workspace }}/bin
           /home/runner/.fhir
         key: '${{ steps.vars.outputs.cache-key }}'
-        save-always: true
 
     - name: 'Install Java'
       if: steps.cache.outputs.cache-hit != 'true' && steps.cache.outputs.cache-hit != true
@@ -62,4 +62,3 @@ runs:
         java -jar '${{ github.workspace }}/bin/validator_cli.jar' -version 4.3.0
         java -jar '${{ github.workspace }}/bin/validator_cli.jar' -version 5.0.0
         echo '::endgroup::'
-

.github/actions/load-fhir-xsd/action.yaml

@@ -25,6 +25,12 @@ outputs:
   cache-key:
     description: 'Actions Cache key'
     value: '${{ steps.vars.cache-key }}'
+  cache-dir:
+    description: 'Root Cache directory'
+    value: '${{ steps.vars.cache-dir }}'
+  version-xsd-cache-dir:
+    description: 'Specific version XSD cache directory'
+    value: '${{ steps.vars.version-xsd-cache-dir }}'
 
 runs:
   using: composite
@@ -37,12 +43,12 @@ runs:
         _cache_key="fhir-source-${{ inputs.version }}-${_month}-1"
         _dl_url="${{ inputs.base-url}}/${{ inputs.version }}/${{ inputs.filename }}"
         _cache_dir="${{ github.workspace }}/input"
-        _xsd_cache_dir="${_cache_dir}/${{ inputs.version }}"
+        _version_xsd_cache_dir="${_cache_dir}/${{ inputs.version }}"
         _zip_filename="${_cache_dir}/${{ inputs.version }}.zip"
 
         echo "cache-key=${_cache_key}" >> $GITHUB_OUTPUT
         echo "cache-dir=${_cache_dir}" >> $GITHUB_OUTPUT
-        echo "xsd-cache-dir=${_xsd_cache_dir}" >> $GITHUB_OUTPUT
+        echo "version-xsd-cache-dir=${_version_xsd_cache_dir}" >> $GITHUB_OUTPUT
         echo "url=${_dl_url}" >> $GITHUB_OUTPUT
         echo "zip-filename=${_zip_filename}" >> $GITHUB_OUTPUT
 
@@ -57,15 +63,39 @@ runs:
       shell: bash -e {0}
       # language=sh
       run: |
-        mkdir -p '${{ steps.vars.outputs.xsd-cache-dir }}'
+        echo "::group::Ensuring cache directory exists"
+        mkdir -p '${{ steps.vars.outputs.version-xsd-cache-dir }}'
+        echo "::endgroup::"
 
+        echo "::group::Downloading '${{ steps.vars.outputs.url }}'"
         curl \
           -L \
           -A '${{ inputs.user-agent }}' \
           -o '${{ steps.vars.outputs.zip-filename }}' \
           '${{ steps.vars.outputs.url }}'
+        echo "::endgroup::"
 
-        unzip -o -qq '${{ steps.vars.outputs.zip-filename }}' -d '${{ steps.vars.outputs.xsd-cache-dir }}'
+        echo "::group::Unzipping '${{ steps.vars.outputs.zip-filename }}'"
+        unzip -o -qq '${{ steps.vars.outputs.zip-filename }}' -d '${{ steps.vars.outputs.version-xsd-cache-dir }}'
+        echo "::endgroup::"
 
+        if [ -d '${{ steps.vars.outputs.version-xsd-cache-dir }}/fhir-all-xsd' ]; then
+            echo "::group::Zip was created on MacOS, cleaning up..."
+
+            mv '${{ steps.vars.outputs.version-xsd-cache-dir }}/fhir-all-xsd'/* '${{ steps.vars.outputs.version-xsd-cache-dir }}'
+            rmdir '${{ steps.vars.outputs.version-xsd-cache-dir }}/fhir-all-xsd'
+
+            echo "::endgroup::"
+        fi
+
+    - name: 'List files'
+      shell: bash -e {0}
+      # language=sh
+      run: |
+        echo "::group::Listing files in '${{ steps.vars.outputs.cache-dir }}'"
         ls -l '${{ steps.vars.outputs.cache-dir}}'
-        ls -l '${{ steps.vars.outputs.xsd-cache-dir }}'
+        echo "::endgroup::"
+
+        echo "::group::Listing files in '${{ steps.vars.outputs.version-xsd-cache-dir }}'"
+        ls -l '${{ steps.vars.outputs.version-xsd-cache-dir }}'
+        echo "::endgroup::"

.github/workflows/tests.yaml

@@ -26,110 +26,85 @@ on:
       - 'phpunit.xml'
 
 jobs:
+  builder-tests:
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version:
+          - '8.1'
+          - '8.2'
+          - '8.3'
+          - '8.4'
+    name: 'Builder Tests - PHP ${{ matrix.php-version }}'
+    steps:
+      - uses: actions/checkout@v4
+      - name: 'Bootstrap'
+        uses: ./.github/actions/bootstrap
+        with:
+          php-version: ${{ matrix.php-version }}
+      - name: 'Run tests'
+        # language=sh
+        run: ./vendor/bin/phpunit -c 'phpunit/Builder.xml'
+
   load-fhir-source:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:
-        fhir-version: [ 'DSTU1', 'DSTU2', 'STU3', 'R4', 'R5' ]
-
-    name: 'Download ${{ matrix.fhir-version }} Source'
+        test-target:
+          - 'DSTU1'
+          - 'DSTU2'
+          - 'STU3'
+          - 'R4'
+          - 'R4B'
+          - 'R5'
+    name: 'Download ${{ matrix.test-target }} Source'
     steps:
       - uses: actions/checkout@v4
-
       - uses: ./.github/actions/load-fhir-xsd
         with:
-          version: '${{ matrix.fhir-version }}'
-
-
-#  load-fhir-validator:
-#    runs-on: ubuntu-22.04
-#    name: 'Download FHIR Validator'
-#    steps:
-#      - uses: actions/checkout@v4
-#
-#      - uses: ./.github/actions/load-fhir-validator
+          version: '${{ matrix.test-target }}'
 
   run:
     runs-on: ubuntu-22.04
     needs:
       - load-fhir-source
-#      - load-fhir-validator
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '8.1', '8.2', '8.3' ]
-        fhir-version: [ 'DSTU1', 'DSTU2', 'STU3', 'R4', 'R5' ]
-        include:
-          - php-version: '8.1'
-            phpunit-version: '10.5'
-          - php-version: '8.2'
-            phpunit-version: '11.1'
-          - php-version: '8.3'
-            phpunit-version: '11.1'
-    name: '${{ matrix.fhir-version }} - PHP ${{ matrix.php-version }} - PHPUnit ${{ matrix.phpunit-version }}'
+        php-version:
+          - '8.1'
+          - '8.2'
+          - '8.3'
+          - '8.4'
+        test-target:
+          - 'Core'
+          - 'DSTU1'
+          - 'DSTU2'
+          - 'STU3'
+          - 'R4'
+          - 'R4B'
+          - 'R5'
+    name: '${{ matrix.test-target }} - PHP ${{ matrix.php-version }} - PHPUnit ${{ matrix.phpunit-version }}'
+    services:
+      php-fhir-test-server:
+        image: dancarbone/php-fhir-test-server:latest
+        ports:
+          - '8080:8080'
     steps:
-      - name: 'Check the stuff out'
-        uses: actions/checkout@v4
-
-      - name: 'Load FHIR ${{ matrix.fhir-version }} Source'
-        uses: ./.github/actions/load-fhir-xsd
-        with:
-          version: '${{ matrix.fhir-version }}'
-
-#      - name: 'Install FHIR validator'
-#        uses: ./.github/actions/load-fhir-validator
-
-      - name: 'Install PHP'
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: libxml simplexml json zip
-          ini-values: precision=20
-
-      - name: 'Install jq'
-        uses: dcarbone/install-jq-action@v3
+      - uses: actions/checkout@v4
+      - name: 'Bootstrap'
+        uses: ./.github/actions/bootstrap
         with:
-          force: true
-
-      - name: 'Set Composer Dep Versions'
-        # language=sh
-        run: |
-          tmpf="$(mktemp)"
-          jq -rcM '."require-dev"."phpunit/phpunit" = "^${{ matrix.phpunit-version }}"' composer.json > "${tmpf}"
-          mv "${tmpf}" composer.json
-
-      - name: 'Get Composer Cache Directory'
-        id: composer-cache
-        # language=sh
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: 'Cache Composer Stuff'
-        uses: actions/cache@v4
+            php-version: ${{ matrix.php-version }}
+      - name: 'Load FHIR ${{ matrix.test-target }} Source'
+        id: fhir-source
+        if: matrix.test-target != 'Core'
+        uses: ./.github/actions/load-fhir-xsd
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: "composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.phpunit-version }}-${{ hashFiles('composer.lock') }}"
-          save-always: true
-
-      - name: 'Install Composer deps'
-        # language=sh
-        run: |
-          rm composer.lock
-          composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
-
-      - name: 'Generate code'
-        # language=sh
-        run: |
-          ./bin/generate.sh --useExisting --versions '${{ matrix.fhir-version }}'
-
-#      - name: 'Install Java'
-#        uses: actions/setup-java@v4
-#        with:
-#          distribution: 'zulu'
-#          java-version: 18
-
+          version: '${{ matrix.test-target }}'
       - name: 'Run tests'
         # language=sh
         run: |
-          ./vendor/bin/phpunit -c 'phpunit/${{ matrix.fhir-version }}.xml'
+          ./vendor/bin/phpunit -c 'phpunit/${{ matrix.test-target }}.xml'