Skip to content

Commit 06b3f99

Browse files
authored
Remove 1 by 1 validation with .NET validator and update Java validator
1 parent 756b58e commit 06b3f99

File tree

1 file changed

+4
-54
lines changed

1 file changed

+4
-54
lines changed

action.yml

Lines changed: 4 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ inputs:
4848
required: true
4949
JAVA_VALIDATOR_VERSION:
5050
description: 'Version of org.hl7.fhir.core library used for Java-based validation'
51-
default: '5.6.65'
51+
default: '5.6.75'
5252
required: true
5353
SUSHI_VERSION:
5454
description: 'Version of SUSHI used for compiling the FSH files'
@@ -233,58 +233,8 @@ runs:
233233
# --------------------------------------------------------------------------------------------------- #
234234
# .NET VALIDATOR #
235235
# --------------------------------------------------------------------------------------------------- #
236-
237-
# Add conformance resources for validation to the stack
238-
- name: Add resources to the Firely Terminal stack
239-
run: |
240-
if $INPUT_DOTNET_VALIDATION_ENABLED; then
241-
echo "Starting validation using .NET validator (Conformance resources) ..."
242-
echo "Trying to validate conformance resources located at the following relative path(s): $INPUT_PATH_TO_CONFORMANCE_RESOURCES"
243-
for p in $INPUT_PATH_TO_CONFORMANCE_RESOURCES;
244-
do
245-
echo Accessing "$p" and pushing resources to the stack...
246-
if [ -d "$GITHUB_WORKSPACE/$p" ]; then
247-
cd $GITHUB_WORKSPACE/$p
248-
fhir push .
249-
else
250-
echo Cannot access "$p" as the path does not exist
251-
fi
252-
done
253-
fi
254-
shell: bash
255-
env:
256-
INPUT_PATH_TO_CONFORMANCE_RESOURCES: ${{ inputs.PATH_TO_CONFORMANCE_RESOURCES }}
257-
INPUT_DOTNET_VALIDATION_ENABLED: ${{ inputs.DOTNET_VALIDATION_ENABLED }}
258-
259-
# Validate all conformance resources on the stack
260-
- name: Validate all conformance resources in scope of the repository
261-
run: |
262-
if $INPUT_DOTNET_VALIDATION_ENABLED; then
263-
count=0
264-
while true; do
265-
currentResource=$(fhir peek || true)
266-
if [[ "$currentResource" == *"The stack is empty."* ]]; then
267-
echo "Validation was executed for all conformance resources on the stack. Validated $count conformance resource(s)."
268-
break
269-
fi
270-
((count=count+1))
271-
echo "Validating $currentResource ..."
272-
273-
result=$(fhir validate)
274-
echo $result
275-
if echo $result | grep -Eq "*"INVALID"*" && echo $INPUT_EXPECTED_FAILS | grep -w -q -v VALIDATION_CONFORMANCE_DOTNET; then
276-
exit 1
277-
fi
278-
279-
fhir pop > /dev/null
280-
done
281-
fi
282-
shell: bash
283-
env:
284-
INPUT_DOTNET_VALIDATION_ENABLED: ${{ inputs.DOTNET_VALIDATION_ENABLED }}
285-
INPUT_EXPECTED_FAILS: ${{ inputs.EXPECTED_FAILS }}
286-
287-
# Run Quality Control checks
236+
237+
# Run Quality Control checks incl. validation
288238
- name: Run Quality Control checks
289239
run: |
290240
if $INPUT_DOTNET_VALIDATION_ENABLED; then
@@ -304,7 +254,7 @@ runs:
304254
env:
305255
INPUT_DOTNET_VALIDATION_ENABLED: ${{ inputs.DOTNET_VALIDATION_ENABLED }}
306256

307-
#Examples are currently not used as Firely Terminal can't validate against profiles on the stack right now
257+
#Examples are currently not used as Firely Terminal can't differentiate between these two in QC checks.
308258

309259
# --------------------------------------------------------------------------------------------------- #
310260
# JAVA Validator #

0 commit comments

Comments
 (0)