Merge pull request #105 from hl7au/validate-master

Make validate step reusable

Author: ir4y

.github/report/action.yml

@@ -6,19 +6,6 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - name: Don't validate quarantine files
-      shell: bash
-      run: rm -v `cat ./quarantine`
-    - shell: bash
-      run: wget https://github.com/hapifhir/org.hl7.fhir.core/releases/latest/download/validator_cli.jar
-    - shell: bash
-      continue-on-error: true
-      run: |
-        java -jar validator_cli.jar generated/*.json \
-             -version 4.0.1 -tx https://tx.dev.hl7.org.au/fhir \
-             -ig hl7.fhir.au.core#1.0.0  -sct au \
-             -level errors -jurisdiction au \
-             -html-output g_validation.html -output g_validation.xml
     - id: validation-result
       name: Archive validation result
       uses: actions/upload-artifact@v4

.github/validate/action.yml

@@ -0,0 +1,22 @@
+name: Validate generated files
+runs:
+  using: 'composite'
+  steps:
+    - name: Don't validate quarantine files
+      shell: bash
+      run: |
+        mkdir ${{ runner.temp }}/quarantine &&\
+        mv -v `cat ./quarantine` ${{ runner.temp }}/quarantine
+    - shell: bash
+      run: wget https://github.com/hapifhir/org.hl7.fhir.core/releases/latest/download/validator_cli.jar
+    - name: Run validator
+      shell: bash
+      run: |
+        java -jar validator_cli.jar generated/*.json \
+             -version 4.0.1 -tx https://tx.dev.hl7.org.au/fhir \
+             -ig hl7.fhir.au.core#1.0.0  -sct au \
+             -level errors -jurisdiction au \
+             -html-output g_validation.html -output g_validation.xml
+    - name: Restore skipped files
+      shell: bash
+      run: mv -v ${{ runner.temp }}/quarantine/* ./generated

.github/workflows/convert.yaml

@@ -39,6 +39,9 @@ jobs:
           labels: automated-pr
           base: master
           branch: ${{ github.event.inputs.branch }}
+    - name: Validate
+      uses: ./.github/validate
+      continue-on-error: true
     - name: Report
       uses: ./.github/report
       with:

.github/workflows/upload.yaml

@@ -13,6 +13,8 @@ jobs:
       uses: actions/checkout@v4
     - name: Install deps
       uses: ./.github/deps
+    - name: Validate
+      uses: ./.github/validate
     - shell: bash
       run: |
         cd /tmp &&\

.github/workflows/validate.yaml

@@ -20,5 +20,7 @@ jobs:
       uses: stefanzweifel/git-auto-commit-action@v5
       with:
         commit_message: Update generated files
+    - name: Validate
+      uses: ./.github/validate
     - name: Report
       uses: ./.github/report