From d8a012c3d321a5f74dbdb031dfdcee703b83b27c Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 1 Apr 2026 09:36:50 +0000 Subject: [PATCH 1/5] Add job to package all platform artifacts into a single zip Adds a `package` job that runs after both `linux` and `windows` jobs complete, downloads their artifacts, and bundles them into a single `modbusscope-all-platforms.zip` artifact. https://claude.ai/code/session_01KR8kVy6SZfAFds84XFTt6d --- .github/workflows/ccpp.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index e76b608c..0d5880c2 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -56,3 +56,26 @@ jobs: path: | ModbusScope.zip ModbusScope_setup.exe + + package: + runs-on: ubuntu-latest + needs: [linux, windows] + + steps: + - uses: actions/download-artifact@v4.3.0 + with: + name: modbusscope-linux + path: all-artifacts/linux + + - uses: actions/download-artifact@v4.3.0 + with: + name: modbusscope-windows + path: all-artifacts/windows + + - name: Create combined zip + run: zip -r modbusscope-all-platforms.zip all-artifacts/ + + - uses: actions/upload-artifact@v7.0.0 + with: + name: modbusscope-all-platforms + path: modbusscope-all-platforms.zip From df338b76ec4d286237e05e9a35c034370c3ffc8f Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 1 Apr 2026 09:39:13 +0000 Subject: [PATCH 2/5] Remove manual zip step, upload-artifact zips automatically https://claude.ai/code/session_01KR8kVy6SZfAFds84XFTt6d --- .github/workflows/ccpp.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 0d5880c2..3fe3e873 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -72,10 +72,7 @@ jobs: name: modbusscope-windows path: all-artifacts/windows - - name: Create combined zip - run: zip -r modbusscope-all-platforms.zip all-artifacts/ - - uses: actions/upload-artifact@v7.0.0 with: name: modbusscope-all-platforms - path: modbusscope-all-platforms.zip + path: all-artifacts/ From e093277d02cc47925bf14c68303fb67b17a7651c Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 1 Apr 2026 09:41:23 +0000 Subject: [PATCH 3/5] Update download-artifact to v8 (latest) https://claude.ai/code/session_01KR8kVy6SZfAFds84XFTt6d --- .github/workflows/ccpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 3fe3e873..a7d482bd 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -62,12 +62,12 @@ jobs: needs: [linux, windows] steps: - - uses: actions/download-artifact@v4.3.0 + - uses: actions/download-artifact@v8 with: name: modbusscope-linux path: all-artifacts/linux - - uses: actions/download-artifact@v4.3.0 + - uses: actions/download-artifact@v8 with: name: modbusscope-windows path: all-artifacts/windows From e3043ba1dcddf4955b533b157f55bdac60170cde Mon Sep 17 00:00:00 2001 From: Jens Geudens Date: Wed, 1 Apr 2026 12:23:41 +0200 Subject: [PATCH 4/5] Apply suggestions from code review Co-authored-by: Jens Geudens --- .github/workflows/ccpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index a7d482bd..170cc445 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -62,12 +62,12 @@ jobs: needs: [linux, windows] steps: - - uses: actions/download-artifact@v8 + - uses: actions/download-artifact@v8.0.1 with: name: modbusscope-linux path: all-artifacts/linux - - uses: actions/download-artifact@v8 + - uses: actions/download-artifact@v8.0.1 with: name: modbusscope-windows path: all-artifacts/windows From 1c9771ffc9d5c3fc87d8f4c3123b4ab14057c1b9 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 1 Apr 2026 11:13:32 +0000 Subject: [PATCH 5/5] Add docs job to build workflow and include PDF in combined artifact Moves the PDF build into ccpp.yml as a `docs` job so the artifact is accessible to the `package` job. doc.yml is kept as-is for standalone doc builds. https://claude.ai/code/session_01KR8kVy6SZfAFds84XFTt6d --- .github/workflows/ccpp.yml | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 170cc445..7e188b76 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -57,9 +57,27 @@ jobs: ModbusScope.zip ModbusScope_setup.exe + docs: + runs-on: ubuntu-latest + + container: + image: docker://jgeudens/doc-latex:20250124_build_1 + steps: + - uses: actions/checkout@v6.0.0 + + - name: Build doc + run: | + sh create_doc.sh + mv docs/manual/_build/latex/modbusscope.pdf modbusscope-user-manual.pdf + + - uses: actions/upload-artifact@v7.0.0 + with: + name: modbusscope-user-manual + path: modbusscope-user-manual.pdf + package: runs-on: ubuntu-latest - needs: [linux, windows] + needs: [linux, windows, docs] steps: - uses: actions/download-artifact@v8.0.1 @@ -72,6 +90,11 @@ jobs: name: modbusscope-windows path: all-artifacts/windows + - uses: actions/download-artifact@v8 + with: + name: modbusscope-user-manual + path: all-artifacts/docs + - uses: actions/upload-artifact@v7.0.0 with: name: modbusscope-all-platforms