From 274c50ed6aadc2bc77ad1e3b6b127946f774f504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= Date: Wed, 4 Sep 2024 11:11:25 +0300 Subject: [PATCH 1/4] Use publisher scripts GitHub actions refuses to work properly with our own Docker configuration. Our config may be outdated? Anyway, using the docker and the scripts provided by HL7 feels like a cleaner solution. --- .github/workflows/build.yml | 14 ++++++++++---- .github/workflows/pr-verification.yml | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4e53a43..c96c097 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,12 +26,18 @@ jobs: runs-on: ubuntu-latest + + steps: - uses: actions/checkout@v4 - - name: Setup IG publisher - run: docker compose run runner bash -c "./_updatePublisher.sh --yes" - - name: Generate the IG - run: docker compose run runner bash -c "./_genonce.sh" + - name: Update the Docker image to the latest publisher + uses: docker://hl7fhir/ig-publisher-base:latest + with: + args: curl -L https://github.com/HL7/fhir-ig-publisher/releases/latest/download/publisher.jar -o ./input-cache/publisher.jar --create-dirs + - name: Run the IG publisher + uses: docker://hl7fhir/ig-publisher-base:latest + with: + args: ./_genonce.sh - name: Setup Pages uses: actions/configure-pages@v5 - name: Upload artifacts diff --git a/.github/workflows/pr-verification.yml b/.github/workflows/pr-verification.yml index bdbbfb9..75b1334 100644 --- a/.github/workflows/pr-verification.yml +++ b/.github/workflows/pr-verification.yml @@ -14,8 +14,8 @@ jobs: - name: Update the Docker image to the latest publisher uses: docker://hl7fhir/ig-publisher-base:latest with: - args: curl -L https://github.com/HL7/fhir-ig-publisher/releases/latest/download/publisher.jar -o ./input-cache/publisher.jar --create-dirs + args: ./_updatePublisher.sh --yes - name: Run the IG publisher uses: docker://hl7fhir/ig-publisher-base:latest with: - args: java -jar ./input-cache/publisher.jar publisher -ig . + args: ./_genonce.sh From 92023ef5424209a25f0a2f71c100b6d704fbcb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= Date: Wed, 4 Sep 2024 11:13:07 +0300 Subject: [PATCH 2/4] Remove empty rows --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c96c097..0d256e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,8 +26,6 @@ jobs: runs-on: ubuntu-latest - - steps: - uses: actions/checkout@v4 - name: Update the Docker image to the latest publisher From 52dd6375a39d720eec8cd9bb299e5eb78558623d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= Date: Wed, 4 Sep 2024 11:17:46 +0300 Subject: [PATCH 3/4] Update publisher with the script --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d256e3..11cb847 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: - name: Update the Docker image to the latest publisher uses: docker://hl7fhir/ig-publisher-base:latest with: - args: curl -L https://github.com/HL7/fhir-ig-publisher/releases/latest/download/publisher.jar -o ./input-cache/publisher.jar --create-dirs + args: ./_updatePublisher.sh --yes - name: Run the IG publisher uses: docker://hl7fhir/ig-publisher-base:latest with: From ca353222ac156a0bfc466382423bcb661aa60486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= Date: Wed, 4 Sep 2024 11:20:21 +0300 Subject: [PATCH 4/4] Remove empty rows --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d446064..11cb847 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,8 +26,6 @@ jobs: runs-on: ubuntu-latest - - steps: - uses: actions/checkout@v4 - name: Update the Docker image to the latest publisher