From e2295e6ee522be50e0868db43131ba427fac3ec5 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Mon, 16 Dec 2024 12:45:45 +0300 Subject: [PATCH 01/23] Add advisor to suppress Java validator issues --- advisor.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 advisor.json diff --git a/advisor.json b/advisor.json new file mode 100644 index 00000000..c24ccfbd --- /dev/null +++ b/advisor.json @@ -0,0 +1,11 @@ +{ + "suppress" : [ + "SD_PATH_SLICING_DEPRECATED", + "TYPE_SPECIFIC_CHECKS_DT_CANONICAL_RESOLVE@CapabilityStatement.implementationGuide", + "http://hl7.org/fhir/StructureDefinition/DomainResource#dom-6", + "Terminology_TX_NoValid_3_CC@HealthcareService.specialty", + "Terminology_TX_NoValid_3_CC@Appointment.specialty", + "Terminology_TX_NoValid_3_CC@Schedule.specialty", + "This_element_does_not_match_any_known_slice_" + ] +} \ No newline at end of file From 7de1fc2072183c989f019cde4bf44877f6b34844 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Mon, 16 Dec 2024 12:49:30 +0300 Subject: [PATCH 02/23] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 704ede37..0b406030 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,7 +48,7 @@ jobs: DOTNET_VALIDATION_ENABLED: false JAVA_VALIDATION_ENABLED: true OUTPUT_FORMAT: RAW - JAVA_VALIDATION_OPTIONS: -allow-example-urls true + JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file advisor.json SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true From f3d859343e6c417ba8866cbdf02e7fe0f29e4391 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Mon, 16 Dec 2024 13:07:38 +0300 Subject: [PATCH 03/23] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0b406030..c7e28526 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,7 +48,7 @@ jobs: DOTNET_VALIDATION_ENABLED: false JAVA_VALIDATION_ENABLED: true OUTPUT_FORMAT: RAW - JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file advisor.json + JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file /home/runner/work/spec-ISiK-Terminplanung/spec-ISiK-Terminplanung/advisor.json SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true From 26857627a73f9a09eea27fbc982d0e76535977bb Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Mon, 16 Dec 2024 13:15:51 +0300 Subject: [PATCH 04/23] Update main.yml --- .github/workflows/main.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c7e28526..4b8100bd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,6 +36,15 @@ jobs: - name: Checkout code (Main) uses: actions/checkout@v4 if: github.event_name != 'pull_request' + + - name: Locale init + run: | + sudo locale-gen en_US.UTF-8 + sudo update-locale LANG=en_US.UTF-8 + + - name: pwd + run: | + pwd # Java and .NET are already installed on ubuntu-latest From 7b3a8548f66d447c48317893a3689f3024a3e2da Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Mon, 16 Dec 2024 14:33:29 +0300 Subject: [PATCH 05/23] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4b8100bd..ef67ab73 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,6 +45,7 @@ jobs: - name: pwd run: | pwd + ls # Java and .NET are already installed on ubuntu-latest From 38e0e1793049e37fe6b9c0e65dcaffc70ae87a58 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Mon, 16 Dec 2024 14:37:36 +0300 Subject: [PATCH 06/23] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ef67ab73..1eaea8f1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,7 @@ jobs: DOTNET_VALIDATION_ENABLED: false JAVA_VALIDATION_ENABLED: true OUTPUT_FORMAT: RAW - JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file /home/runner/work/spec-ISiK-Terminplanung/spec-ISiK-Terminplanung/advisor.json + JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file advisor.json SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true From 401c230277c2e988c1616688b733f1e54ef99602 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Mon, 16 Dec 2024 14:41:29 +0300 Subject: [PATCH 07/23] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1eaea8f1..4c37c972 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -50,7 +50,7 @@ jobs: # Java and .NET are already installed on ubuntu-latest - name: Firely.Terminal (GitHub Actions) - uses: FirelyTeam/firely-terminal-pipeline@v0.4.5 + uses: FirelyTeam/firely-terminal-pipeline@v0.4.6 with: PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/ #PATH_TO_EXAMPLES: Examples From b3a1070217e61a6670b6861fc11b5673624b8ed7 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Mon, 16 Dec 2024 14:55:26 +0300 Subject: [PATCH 08/23] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4c37c972..f0d1a635 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,7 @@ jobs: DOTNET_VALIDATION_ENABLED: false JAVA_VALIDATION_ENABLED: true OUTPUT_FORMAT: RAW - JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file advisor.json + JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file advisor.json -locale en SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true From a4a5821e159aa432da46c82f374345e2cf924d5c Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 13:20:04 +0300 Subject: [PATCH 09/23] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f0d1a635..a86607d2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,6 +41,8 @@ jobs: run: | sudo locale-gen en_US.UTF-8 sudo update-locale LANG=en_US.UTF-8 + export LANG=en_US.utf8 + export LC_ALL=en_US.UTF-8 - name: pwd run: | From 7a111efea7e6b2d2c8633951cfcca4ba73869c62 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 13:24:45 +0300 Subject: [PATCH 10/23] Update main.yml --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a86607d2..455f09ba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,6 +48,9 @@ jobs: run: | pwd ls + echo $LANG + echo $LC_ALL + echo 'Test' # Java and .NET are already installed on ubuntu-latest From 63c3d1a50ae0fffd4546a8b3c113b9f98b68bf2c Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 13:26:25 +0300 Subject: [PATCH 11/23] Update main.yml --- .github/workflows/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 455f09ba..5a90a381 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,11 +46,10 @@ jobs: - name: pwd run: | - pwd - ls echo $LANG + echo 'LANG' echo $LC_ALL - echo 'Test' + echo 'LC_ALL' # Java and .NET are already installed on ubuntu-latest From f14a8f6b8edaf987216d707506dd71c8bb26c07c Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 13:29:32 +0300 Subject: [PATCH 12/23] Update main.yml --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5a90a381..e3976e36 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,10 +39,8 @@ jobs: - name: Locale init run: | - sudo locale-gen en_US.UTF-8 - sudo update-locale LANG=en_US.UTF-8 - export LANG=en_US.utf8 - export LC_ALL=en_US.UTF-8 + echo "LANG=en_US.utf8" >> $GITHUB_ENV + echo "LC_ALL=en_US.UTF-8" >> $GITHUB_ENV - name: pwd run: | From cc9af6674275662422efbb59abbf777d67ea30de Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 13:41:53 +0300 Subject: [PATCH 13/23] Update main.yml --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3976e36..6cca2424 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,10 +44,8 @@ jobs: - name: pwd run: | - echo $LANG - echo 'LANG' - echo $LC_ALL - echo 'LC_ALL' + pwd + ls # Java and .NET are already installed on ubuntu-latest From 1e3527bf9a9331d6957d831a1d76a565b16ab90c Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 13:42:46 +0300 Subject: [PATCH 14/23] Update advisor.json --- advisor.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/advisor.json b/advisor.json index c24ccfbd..f0b753df 100644 --- a/advisor.json +++ b/advisor.json @@ -1,11 +1,11 @@ { - "suppress" : [ + "suppress" : "SD_PATH_SLICING_DEPRECATED", "TYPE_SPECIFIC_CHECKS_DT_CANONICAL_RESOLVE@CapabilityStatement.implementationGuide", - "http://hl7.org/fhir/StructureDefinition/DomainResource#dom-6", + "http://hl7.org/fhir/StructureDefinition/DomainResource#dom-6" "Terminology_TX_NoValid_3_CC@HealthcareService.specialty", "Terminology_TX_NoValid_3_CC@Appointment.specialty", "Terminology_TX_NoValid_3_CC@Schedule.specialty", "This_element_does_not_match_any_known_slice_" - ] -} \ No newline at end of file + +} From 9e4ced75cabf53561165c237fd849fbae6ad793b Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 13:46:47 +0300 Subject: [PATCH 15/23] Update advisor.json --- advisor.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/advisor.json b/advisor.json index f0b753df..7ec90e92 100644 --- a/advisor.json +++ b/advisor.json @@ -1,11 +1,11 @@ { - "suppress" : + "suppress" : [ "SD_PATH_SLICING_DEPRECATED", "TYPE_SPECIFIC_CHECKS_DT_CANONICAL_RESOLVE@CapabilityStatement.implementationGuide", - "http://hl7.org/fhir/StructureDefinition/DomainResource#dom-6" + "http://hl7.org/fhir/StructureDefinition/DomainResource#dom-6", "Terminology_TX_NoValid_3_CC@HealthcareService.specialty", "Terminology_TX_NoValid_3_CC@Appointment.specialty", "Terminology_TX_NoValid_3_CC@Schedule.specialty", "This_element_does_not_match_any_known_slice_" - + ] } From f7e97373193cbd54c14799b0955b7060d9456996 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 13:51:23 +0300 Subject: [PATCH 16/23] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6cca2424..a1cf98c8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,7 @@ jobs: DOTNET_VALIDATION_ENABLED: false JAVA_VALIDATION_ENABLED: true OUTPUT_FORMAT: RAW - JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file advisor.json -locale en + JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file advisor.json -output-style compact -show-message-ids SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true From b07a9433a46118a51b849f3c165e43972351571c Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 14:03:01 +0300 Subject: [PATCH 17/23] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a1cf98c8..2d15faaa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,7 @@ jobs: DOTNET_VALIDATION_ENABLED: false JAVA_VALIDATION_ENABLED: true OUTPUT_FORMAT: RAW - JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file advisor.json -output-style compact -show-message-ids + JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file advisor_does_not_exist.json -output-style compact -show-message-ids SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true From 57602d37426e3c06d71771c2183e36ce0a620599 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 14:05:05 +0300 Subject: [PATCH 18/23] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2d15faaa..a1cf98c8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,7 @@ jobs: DOTNET_VALIDATION_ENABLED: false JAVA_VALIDATION_ENABLED: true OUTPUT_FORMAT: RAW - JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file advisor_does_not_exist.json -output-style compact -show-message-ids + JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file advisor.json -output-style compact -show-message-ids SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true From 96ef381f0b0e565c9f8df74b8d04efd6e35d9718 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 14:06:45 +0300 Subject: [PATCH 19/23] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a1cf98c8..d6f8398c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,7 +61,7 @@ jobs: JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file advisor.json -output-style compact -show-message-ids SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} - SUSHI_ENABLED: true + SUSHI_ENABLED: false SUSHI_OPTIONS: Resources/ EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA From bfd7e9c89cb64e188d87e6769633589a92e45e95 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 14:09:41 +0300 Subject: [PATCH 20/23] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d6f8398c..a1cf98c8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,7 +61,7 @@ jobs: JAVA_VALIDATION_OPTIONS: -allow-example-urls true -advisor-file advisor.json -output-style compact -show-message-ids SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} - SUSHI_ENABLED: false + SUSHI_ENABLED: true SUSHI_OPTIONS: Resources/ EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA From 1eeee0f36a511e9094972c0b025e3313455bbc62 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 14:43:37 +0300 Subject: [PATCH 21/23] Update main.yml --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a1cf98c8..64903923 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -50,7 +50,7 @@ jobs: # Java and .NET are already installed on ubuntu-latest - name: Firely.Terminal (GitHub Actions) - uses: FirelyTeam/firely-terminal-pipeline@v0.4.6 + uses: FirelyTeam/firely-terminal-pipeline@v0.4.7-alpha3 with: PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/ #PATH_TO_EXAMPLES: Examples @@ -64,6 +64,7 @@ jobs: SUSHI_ENABLED: true SUSHI_OPTIONS: Resources/ EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA + JAVA_VALIDATOR_DOWNLOAD_LOCATION: https://ig.fhir.de/download/org.hl7.fhir.validation.cli-6.5.2-SNAPSHOT.jar - name: Add & Commit uses: EndBug/add-and-commit@v9 From 7d797d0225c93e7fa5ccb1293e360971d630bee7 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 14:52:35 +0300 Subject: [PATCH 22/23] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 64903923..83cc419e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -50,7 +50,7 @@ jobs: # Java and .NET are already installed on ubuntu-latest - name: Firely.Terminal (GitHub Actions) - uses: FirelyTeam/firely-terminal-pipeline@v0.4.7-alpha3 + uses: FirelyTeam/firely-terminal-pipeline@v0.4.7-alpha4 with: PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/ #PATH_TO_EXAMPLES: Examples From f40cb582ee346ae14975945b6d74688177bef387 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 18 Dec 2024 15:00:20 +0300 Subject: [PATCH 23/23] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 83cc419e..807eebc4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,7 +64,7 @@ jobs: SUSHI_ENABLED: true SUSHI_OPTIONS: Resources/ EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA - JAVA_VALIDATOR_DOWNLOAD_LOCATION: https://ig.fhir.de/download/org.hl7.fhir.validation.cli-6.5.2-SNAPSHOT.jar + JAVA_VALIDATOR_DOWNLOAD_LOCATION: https://ig.fhir.de/download/validator_cli.jar - name: Add & Commit uses: EndBug/add-and-commit@v9