From 72555c40e9b1134c8879d4e33be50c92f56907f4 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Wed, 16 Sep 2026 00:53:00 +0200 Subject: [PATCH] ci: align pipelines with portable runtime --- Jenkinsfile | 160 +++++++----------------------------- diagnostics | 2 +- reporter | 2 +- reports | 2 +- scripts/check-components.sh | 2 +- 5 files changed, 32 insertions(+), 136 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ebd0f3a..0bf009b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,3 @@ -// Add this webhook in Gitea: -// http://192.168.1.37:8080/gitea-webhook/post - pipeline { agent { label 'rust_no_docker' } @@ -9,138 +6,46 @@ pipeline { skipDefaultCheckout(true) } - environment { - CARGO_TERM_COLOR = 'always' - CI_ARTIFACT_DIR = '.ci-artifacts' - } - stages { stage('Checkout') { steps { checkout([ $class: 'GitSCM', branches: scm.branches, - extensions: [ - [$class: 'SubmoduleOption', - disableSubmodules: false, - parentCredentials: true, - recursiveSubmodules: true, - reference: '', - shallow: false, - trackingSubmodules: false - ] - ], + extensions: [[ + $class: 'SubmoduleOption', + disableSubmodules: false, + parentCredentials: true, + recursiveSubmodules: true, + reference: '', + shallow: false, + trackingSubmodules: false + ]], userRemoteConfigs: scm.userRemoteConfigs ]) - - sh ''' - set -eu - - echo - echo "Submodules:" - git submodule status --recursive - ''' } } + stage('Validate Workspace') { steps { sh ''' set -eu - - echo "Validating macro repository..." - test -f README.md test -f LICENSE.md - - echo - echo "Submodules:" + test -f Makefile + test -x bootstrap.sh + test -x scripts/check-components.sh + ./bootstrap.sh --check git submodule status --recursive - - echo - echo "Workspace structure OK." ''' } } - - /* - * Legacy references - * ----------------- - * - * During migration, references/WinDiagnostics and - * references/typst_reporter may also be submodules. - * - * They are migration references and should NOT become runtime - * dependencies of the final architecture. - * - * We therefore intentionally do not require them here forever. - */ - - stage('Component Contract Checks') { + stage('Test Components and Integration') { steps { - sh 'bash scripts/check-components.sh' + sh 'make check' } } - - /* - * TODO: Integration Test - * - * The current synthetic check covers raw-capture analysis, adapter - * generation and PDF rendering using the first migrated diagnostic rule. - * Expand it as the remaining rule catalog and collector are implemented: - * - * diagnostic fixture - * ↓ - * win-diagnostics - * ↓ - * diagnostic.json - * ↓ - * beffroi-reports adapter - * ↓ - * report.yaml - * ↓ - * reportist - * ↓ - * report.pdf - */ - - /* Typst is an explicit agent dependency checked by make check. */ - - /* - * TODO: Setup Packaging - * - * The previous reporting project used: - * - * uv venv --allow-existing .ci-venv - * uv pip install ... - * - * Do not migrate this until packaging is actually needed. - */ - - /* - * TODO: Render Reports - * - * Rendering should use Reportist against report definitions owned - * by beffroi-reports. - */ - - /* - * TODO: Package Reports - * - * If encrypted report archives remain useful, migrate the existing - * pyzipper-based packaging here after the new pipeline works. - */ - - /* - * TODO: Publish Reports - * - * Potential future destination: - * - * /mnt/books/Reports - * - * Do not enable publication until generated output has been - * manually compared with the existing production reports. - */ } post { @@ -148,40 +53,31 @@ pipeline { publishChecks( conclusion: 'SUCCESS', name: 'Beffroi Reporting CI', - summary: 'Beffroi Reporting workspace passed all currently implemented CI checks.', - text: 'Contracts and the first raw-capture analysis-to-PDF integration passed. Remaining diagnostic rules and native collection are pending.', - title: 'Reporting workspace healthy' + summary: 'All component and integration checks passed.', + text: 'Diagnostic analysis, immutable draft generation, contract validation, and PDF rendering passed.', + title: 'Beffroi Reporting CI passed' ) - - echo '✅ Beffroi Reporting workspace is healthy.' + echo '✅ Beffroi Reporting CI passed.' } - failure { publishChecks( conclusion: 'FAILURE', name: 'Beffroi Reporting CI', - summary: 'Beffroi Reporting integration CI failed.', - text: 'Workspace checkout, submodule initialization, or validation failed. Check the Jenkins log.', - title: 'Reporting workspace failed' + summary: 'A component or integration check failed.', + text: 'Review the Jenkins log for the failing repository, contract, publication, or rendering check.', + title: 'Beffroi Reporting CI failed' ) - - echo '❌ Beffroi Reporting integration CI failed.' + echo '❌ Beffroi Reporting CI failed.' } - unstable { publishChecks( conclusion: 'ACTION_REQUIRED', name: 'Beffroi Reporting CI', - summary: 'Beffroi Reporting integration CI is unstable.', - text: 'The Jenkins build completed with an unstable status.', - title: 'Reporting workspace unstable' + summary: 'The integration build is unstable.', + text: 'Review the Jenkins log for unstable checks.', + title: 'Beffroi Reporting CI unstable' ) - - echo '⚠️ Beffroi Reporting integration CI is unstable.' - } - - always { - echo 'CI finished.' + echo '⚠️ Beffroi Reporting CI is unstable.' } } } diff --git a/diagnostics b/diagnostics index 3b139c1..c361ac6 160000 --- a/diagnostics +++ b/diagnostics @@ -1 +1 @@ -Subproject commit 3b139c15db42ff8b4da08faf1171617b1526a31f +Subproject commit c361ac62ff08376272ef5ec95ce9c7372d0949a0 diff --git a/reporter b/reporter index ee00bb3..006382e 160000 --- a/reporter +++ b/reporter @@ -1 +1 @@ -Subproject commit ee00bb3df9a618e3f01ce4145e729ca0ed6c4fb0 +Subproject commit 006382e695548fdb082e39ad311d0de9c13c4579 diff --git a/reports b/reports index c92480d..3ec3f3f 160000 --- a/reports +++ b/reports @@ -1 +1 @@ -Subproject commit c92480d603d7b633d90029f13fd0ae80c85837ec +Subproject commit 3ec3f3fcee74f7ec25d850a841e74931da0c8f4f diff --git a/scripts/check-components.sh b/scripts/check-components.sh index ebf0031..b1b7a9a 100644 --- a/scripts/check-components.sh +++ b/scripts/check-components.sh @@ -47,4 +47,4 @@ bash scripts/workflow.sh all \ jq -e '.findings[0].id == "event-service-control-manager-7000" and .findings[0].evidence == ["event-recent_system_errors-1"]' "$pipeline_check_root/diagnostic.json" >/dev/null test "$(head -c 5 "$pipeline_check_root/report.pdf")" = '%PDF-' -echo 'Raw-capture analysis, adapter, and PDF pipeline passed. Native collection and non-event health checks remain.' +echo 'Component suites and the raw-capture-to-PDF integration pipeline passed.'