From 8cc2431a9211f67d996ac99fd20c5bb93844bd08 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 10:09:24 +0100 Subject: [PATCH 01/21] Workflow test --- .github/workflows/installation-guide.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/installation-guide.yml diff --git a/.github/workflows/installation-guide.yml b/.github/workflows/installation-guide.yml new file mode 100644 index 00000000..c225e220 --- /dev/null +++ b/.github/workflows/installation-guide.yml @@ -0,0 +1,11 @@ +name: build-ig + +on: push + +jobs: + build-ig: + name: Implementation Guide + runs-on: ubuntu-latest + steps: + - name: Generate Report + run: _genonce.bat From ee0a1816436203a08f7cdebee3625cbcebe2b00e Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 10:15:03 +0100 Subject: [PATCH 02/21] Delete .github/workflows/installation-guide.yml --- .github/workflows/installation-guide.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .github/workflows/installation-guide.yml diff --git a/.github/workflows/installation-guide.yml b/.github/workflows/installation-guide.yml deleted file mode 100644 index c225e220..00000000 --- a/.github/workflows/installation-guide.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: build-ig - -on: push - -jobs: - build-ig: - name: Implementation Guide - runs-on: ubuntu-latest - steps: - - name: Generate Report - run: _genonce.bat From afa243f6a9920298b06bac2e8b9939f5eb44acb4 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 10:23:04 +0100 Subject: [PATCH 03/21] 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 8b6bf208..871984f7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: # Java and .NET are already installed on ubuntu-latest - name: Firely.Terminal (GitHub Actions) - uses: FirelyTeam/firely-terminal-pipeline@v0.4.0 + uses: FirelyTeam/firely-terminal-pipeline@v0.6.0 with: PATH_TO_CONFORMANCE_RESOURCES: fsh-generated/resources PATH_TO_EXAMPLES: fsh-generated/resources From f6f899a04ba1731bf1b733d44dc797f118f4ef32 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 10:40:44 +0100 Subject: [PATCH 04/21] Update main.yml --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 871984f7..1f37a3f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,6 +20,9 @@ jobs: CI_FHIR_VALIDATION: # The type of runner that the job will run on runs-on: ubuntu-latest + + permissions: + contents: read # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -38,7 +41,6 @@ jobs: DOTNET_VALIDATION_ENABLED: true JAVA_VALIDATION_ENABLED: true EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA - OUTPUT_FORMAT: RAW JAVA_VALIDATION_OPTIONS: -allow-example-urls true -tx n/a SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} From 925d73de8f8ca03848cbb6ecdfd5edb044df3954 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 10:49:14 +0100 Subject: [PATCH 05/21] Update main.yml --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f37a3f5..34de40a7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,9 +20,6 @@ jobs: CI_FHIR_VALIDATION: # The type of runner that the job will run on runs-on: ubuntu-latest - - permissions: - contents: read # Steps represent a sequence of tasks that will be executed as part of the job steps: From 52dc3c65fd11e013b4b8637d183bfc4c4e907e53 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 11:38:52 +0100 Subject: [PATCH 06/21] 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 34de40a7..07225a56 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,3 +42,4 @@ jobs: SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} JAVA_VALIDATOR_VERSION: 6.2.3 + ZTS_ENABLED: false From b07ac6e8773fcb3c7eab80cf4396a6cce0002f21 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 11:42:15 +0100 Subject: [PATCH 07/21] 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 07225a56..5f999971 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: PATH_TO_CONFORMANCE_RESOURCES: fsh-generated/resources PATH_TO_EXAMPLES: fsh-generated/resources PATH_TO_QUALITY_CONTROL_RULES: qc/custom - DOTNET_VALIDATION_ENABLED: true + DOTNET_VALIDATION_ENABLED: false # true = This feature is part of a paid plan. Please upgrade your Simplifier license. JAVA_VALIDATION_ENABLED: true EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA JAVA_VALIDATION_OPTIONS: -allow-example-urls true -tx n/a From 4c2673d959d0a7fcb677bed3165650f00fa7c978 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 11:47:48 +0100 Subject: [PATCH 08/21] Update build-profiles.yml --- .github/workflows/build-profiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-profiles.yml b/.github/workflows/build-profiles.yml index eed5e182..58ac4a25 100644 --- a/.github/workflows/build-profiles.yml +++ b/.github/workflows/build-profiles.yml @@ -26,7 +26,7 @@ jobs: - name: Update FHIR Profiles uses: cybernop/build-fhir-profiles@v1 with: - sushi-version: "3.11.0" + sushi-version: "3.14.0" project-dir: profiles - name: Push built Profiles uses: cybernop/push-fsh-profiles@v1 From 6e4624a2dc042b27b5fd3223f456aa6fed9c3b9e Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 11:52:59 +0100 Subject: [PATCH 09/21] 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 5f999971..359dcf86 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,5 +41,5 @@ jobs: JAVA_VALIDATION_OPTIONS: -allow-example-urls true -tx n/a SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} - JAVA_VALIDATOR_VERSION: 6.2.3 + JAVA_VALIDATOR_VERSION: 6.5.2 ZTS_ENABLED: false From 03023eac269f4c5c16618cb2004528629c05d8a0 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 12:05:08 +0100 Subject: [PATCH 10/21] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 359dcf86..8c220a2d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: # Java and .NET are already installed on ubuntu-latest - name: Firely.Terminal (GitHub Actions) - uses: FirelyTeam/firely-terminal-pipeline@v0.6.0 + uses: FirelyTeam/firely-terminal-pipeline@v0.4.0 with: PATH_TO_CONFORMANCE_RESOURCES: fsh-generated/resources PATH_TO_EXAMPLES: fsh-generated/resources @@ -41,5 +41,5 @@ jobs: JAVA_VALIDATION_OPTIONS: -allow-example-urls true -tx n/a SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} - JAVA_VALIDATOR_VERSION: 6.5.2 + JAVA_VALIDATOR_VERSION: 6.2.3 ZTS_ENABLED: false From 3968e16e5163884783687e4a2cb1bb5129c0cf89 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 12:10:09 +0100 Subject: [PATCH 11/21] Update Dockerfile --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 87deb359..6c28f7ea 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -23,4 +23,4 @@ RUN wget -q -P ${WORKSPACE_ROOT} https://github.com/plantuml/plantuml/releases/l USER vscode # Install Firely Terminal to handle FHIR packages -RUN dotnet tool install -g firely.terminal \ No newline at end of file +RUN dotnet8-sdk tool install -g firely.terminal From e5049db9a5d062ffb86e5039a1464e6015bafd50 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 12:15:32 +0100 Subject: [PATCH 12/21] Update Dockerfile --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 6c28f7ea..406f9f4b 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -23,4 +23,4 @@ RUN wget -q -P ${WORKSPACE_ROOT} https://github.com/plantuml/plantuml/releases/l USER vscode # Install Firely Terminal to handle FHIR packages -RUN dotnet8-sdk tool install -g firely.terminal +RUN dotnet tool install -g firely.terminal From 54a342d348db295e262f7b3c508d2feedfd43de9 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 12:16:14 +0100 Subject: [PATCH 13/21] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8c220a2d..359dcf86 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: # Java and .NET are already installed on ubuntu-latest - name: Firely.Terminal (GitHub Actions) - uses: FirelyTeam/firely-terminal-pipeline@v0.4.0 + uses: FirelyTeam/firely-terminal-pipeline@v0.6.0 with: PATH_TO_CONFORMANCE_RESOURCES: fsh-generated/resources PATH_TO_EXAMPLES: fsh-generated/resources @@ -41,5 +41,5 @@ jobs: JAVA_VALIDATION_OPTIONS: -allow-example-urls true -tx n/a SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} - JAVA_VALIDATOR_VERSION: 6.2.3 + JAVA_VALIDATOR_VERSION: 6.5.2 ZTS_ENABLED: false From f3840db9822253782e2d16a6a08bf409b418d38b Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 12:20:32 +0100 Subject: [PATCH 14/21] Update build-profiles.yml --- .github/workflows/build-profiles.yml | 29 +++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-profiles.yml b/.github/workflows/build-profiles.yml index 58ac4a25..b06d53e5 100644 --- a/.github/workflows/build-profiles.yml +++ b/.github/workflows/build-profiles.yml @@ -19,10 +19,33 @@ jobs: uses: actions/checkout@v3 with: path: profiles - - name: Get FHIR packages - uses: cybernop/fill-fhir-cache@v1 + - name: Setup NodeJS + uses: actions/setup-node@v3 with: - project-dir: profiles + node-version: 18 + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: "8.0" + - name: Create temp dir and copy sushi project file + run: mkdir temp && cp -v ${{ inputs.project-dir }}/sushi-config.yaml temp/ + shell: bash + - name: Install sushi locally + working-directory: temp + run: npm install -g fsh-sushi + shell: bash + - name: Install Firely Terminal + run: dotnet tool install -g firely.terminal + shell: bash + - name: Get dependencies + working-directory: temp + run: sushi + shell: bash + - name: Inflate FHIR packages + run: fhir inflate-cache + shell: bash + - name: Remove temporary files + run: npm remove -g fsh-sushi && rm -rf temp + shell: bash - name: Update FHIR Profiles uses: cybernop/build-fhir-profiles@v1 with: From c276f108c8355db38a6ad6f43cbc7204bcf7204c Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 12:23:17 +0100 Subject: [PATCH 15/21] Update build-ig.yml --- .github/workflows/build-ig.yml | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-ig.yml b/.github/workflows/build-ig.yml index 41435062..e779d401 100644 --- a/.github/workflows/build-ig.yml +++ b/.github/workflows/build-ig.yml @@ -18,8 +18,33 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - - name: Get FHIR packages - uses: cybernop/fill-fhir-cache@v1 + - name: Setup NodeJS + uses: actions/setup-node@v3 + with: + node-version: 18 + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: "8.0" + - name: Create temp dir and copy sushi project file + run: mkdir temp && cp -v ${{ inputs.project-dir }}/sushi-config.yaml temp/ + shell: bash + - name: Install sushi locally + working-directory: temp + run: npm install -g fsh-sushi + shell: bash + - name: Install Firely Terminal + run: dotnet tool install -g firely.terminal + shell: bash + - name: Get dependencies + working-directory: temp + run: sushi + shell: bash + - name: Inflate FHIR packages + run: fhir inflate-cache + shell: bash + - name: Remove temporary files + run: npm remove -g fsh-sushi && rm -rf temp + shell: bash - name: Build profiles uses: cybernop/build-fhir-ig@v1 with: From 4c442d6a15dfc2e9af463fab3bd44dc0104befea Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 12:25:58 +0100 Subject: [PATCH 16/21] Update build-ig.yml --- .github/workflows/build-ig.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ig.yml b/.github/workflows/build-ig.yml index e779d401..43ac91f9 100644 --- a/.github/workflows/build-ig.yml +++ b/.github/workflows/build-ig.yml @@ -26,7 +26,7 @@ jobs: with: dotnet-version: "8.0" - name: Create temp dir and copy sushi project file - run: mkdir temp && cp -v ${{ inputs.project-dir }}/sushi-config.yaml temp/ + run: mkdir temp && cp -v ./sushi-config.yaml temp/ shell: bash - name: Install sushi locally working-directory: temp From fb26babf0d25da67f3f59c341ffe35edf12e4534 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 12:31:00 +0100 Subject: [PATCH 17/21] Update build-profiles.yml --- .github/workflows/build-profiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-profiles.yml b/.github/workflows/build-profiles.yml index b06d53e5..35959c1b 100644 --- a/.github/workflows/build-profiles.yml +++ b/.github/workflows/build-profiles.yml @@ -27,7 +27,7 @@ jobs: with: dotnet-version: "8.0" - name: Create temp dir and copy sushi project file - run: mkdir temp && cp -v ${{ inputs.project-dir }}/sushi-config.yaml temp/ + run: mkdir temp && cp -v ./sushi-config.yaml temp/ shell: bash - name: Install sushi locally working-directory: temp From b1c5cdd7a959d3bfc7c75d88089c27118681272b Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 13:36:05 +0100 Subject: [PATCH 18/21] Update build-profiles.yml --- .github/workflows/build-profiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-profiles.yml b/.github/workflows/build-profiles.yml index 35959c1b..5622843a 100644 --- a/.github/workflows/build-profiles.yml +++ b/.github/workflows/build-profiles.yml @@ -27,7 +27,7 @@ jobs: with: dotnet-version: "8.0" - name: Create temp dir and copy sushi project file - run: mkdir temp && cp -v ./sushi-config.yaml temp/ + run: mkdir temp && cp -v "**/sushi-config.yaml" temp/ shell: bash - name: Install sushi locally working-directory: temp From c3f54fb487eb484fa7362ed459947a511c91c3f6 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 13:44:25 +0100 Subject: [PATCH 19/21] Update build-profiles.yml --- .github/workflows/build-profiles.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-profiles.yml b/.github/workflows/build-profiles.yml index 5622843a..616fe6e0 100644 --- a/.github/workflows/build-profiles.yml +++ b/.github/workflows/build-profiles.yml @@ -4,7 +4,6 @@ on: push: paths: - "**.fsh" - - "**/sushi-config.yaml" branches: [ main, dev ] pull_request: branches: [ main, dev ] @@ -27,7 +26,7 @@ jobs: with: dotnet-version: "8.0" - name: Create temp dir and copy sushi project file - run: mkdir temp && cp -v "**/sushi-config.yaml" temp/ + run: mkdir temp && cp -v ./sushi-config.yaml temp/ shell: bash - name: Install sushi locally working-directory: temp From 5d487b7c39a358b78c7524fa8aced06445c23a80 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 13:46:46 +0100 Subject: [PATCH 20/21] Update build-profiles.yml --- .github/workflows/build-profiles.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-profiles.yml b/.github/workflows/build-profiles.yml index 616fe6e0..31c5e81c 100644 --- a/.github/workflows/build-profiles.yml +++ b/.github/workflows/build-profiles.yml @@ -4,6 +4,7 @@ on: push: paths: - "**.fsh" + - "**/sushi-config.yaml" branches: [ main, dev ] pull_request: branches: [ main, dev ] @@ -26,7 +27,7 @@ jobs: with: dotnet-version: "8.0" - name: Create temp dir and copy sushi project file - run: mkdir temp && cp -v ./sushi-config.yaml temp/ + run: mkdir temp && cp -v profiles/sushi-config.yaml temp/ shell: bash - name: Install sushi locally working-directory: temp From f9e5d9d6decf2252028ba4d6750e08ee714d1377 Mon Sep 17 00:00:00 2001 From: dansch1 Date: Fri, 10 Jan 2025 13:55:55 +0100 Subject: [PATCH 21/21] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 8b51bfae..b9a5fbff 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,9 @@ After following this instructions, a prepared docker image will be downloaded an ## Links +### Implementation Guide +* [EyeMatics Kerndatensatz (Latest)](https://imi-ms.github.io/eyematics-kds/) + ### Specifications * [FHIR Profiling Specification (Latest)](https://www.hl7.org/fhir/profiling.html)