From e39418507093eb7d7cacab2a01f8b36e8202f2aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= Date: Tue, 3 Sep 2024 17:09:44 +0300 Subject: [PATCH 1/2] Update workflow scripts Use latest versions of actions. Build the whole ig publisher instead of just sushi, in PR check. --- .github/workflows/build.yml | 8 ++++---- .github/workflows/pr-verification.yml | 12 +++++++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b04f74..b6354f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,17 +28,17 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup IG publisher run: docker compose run runner bash -c "./_updatePublisher.sh --yes" - name: Generate run: docker compose run runner bash -c "./_genonce.sh" - name: Setup Pages - uses: actions/configure-pages@v2 + uses: actions/configure-pages@v5 - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 with: path: './output' - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 + uses: actions/deploy-pages@v4 diff --git a/.github/workflows/pr-verification.yml b/.github/workflows/pr-verification.yml index 105653b..454c3de 100644 --- a/.github/workflows/pr-verification.yml +++ b/.github/workflows/pr-verification.yml @@ -10,6 +10,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Run sushi - run: docker compose run runner bash -c "sushi" + - uses: actions/checkout@v4 + - 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: java -jar ./input-cache/publisher.jar publisher -ig . \ No newline at end of file From b2c66822183ff6ca185854ecca725fdac17df3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20Rinnetm=C3=A4ki?= Date: Wed, 4 Sep 2024 15:11:02 +0300 Subject: [PATCH 2/2] Use scripts to update and run the publisher --- .github/workflows/build.yml | 21 ++++++++++++--------- .github/workflows/pr-verification.yml | 4 ++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6354f5..11cb847 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,14 +1,13 @@ -# This workflow will setup IG publisher, run sushi -# It should also publish results (TBD) +# This workflow sets up and runs the IG publisher and publishes the results to GitHub Pages name: Node.js CI on: push: - branches: [ "master" ] + branches: [ master ] workflow_dispatch: -# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +# Set permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages permissions: contents: read pages: write @@ -29,13 +28,17 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup IG publisher - run: docker compose run runner bash -c "./_updatePublisher.sh --yes" - - name: Generate - 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: ./_updatePublisher.sh --yes + - 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 artifact + - name: Upload artifacts uses: actions/upload-pages-artifact@v3 with: path: './output' diff --git a/.github/workflows/pr-verification.yml b/.github/workflows/pr-verification.yml index 454c3de..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 . \ No newline at end of file + args: ./_genonce.sh