From 83529e3e05c4335ebbf337e33760c2a3b192ae7e Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Wed, 16 Sep 2026 02:13:39 +0200 Subject: [PATCH] chore: follow reportist root entrypoint --- beffroi.sh | 2 +- reporter | 2 +- scripts/check-components.sh | 11 +++++++++-- scripts/workflow-all.sh | 2 +- scripts/workflow.sh | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/beffroi.sh b/beffroi.sh index 2cdc10b..7378696 100755 --- a/beffroi.sh +++ b/beffroi.sh @@ -26,7 +26,7 @@ command_name=${1:-help}; shift || true case "$command_name" in report) [[ $# -eq 2 ]]||usage 2; require typst - reporter/tools/render.sh "$1" --output "$2" + reporter/render.sh "$1" --output "$2" ;; diagnostic) [[ $# -eq 7 ]]||usage 2; require git typst diff --git a/reporter b/reporter index fe421e4..d5ad5bb 160000 --- a/reporter +++ b/reporter @@ -1 +1 @@ -Subproject commit fe421e4ffaf24f9898216eb4e46b932d591fed0a +Subproject commit d5ad5bb0e687f9982f2d15092ceda0af539cfa0e diff --git a/scripts/check-components.sh b/scripts/check-components.sh index adcefa2..cdd373b 100755 --- a/scripts/check-components.sh +++ b/scripts/check-components.sh @@ -8,12 +8,16 @@ command -v uv >/dev/null 2>&1 || { exit 1 } -for component in diagnostics reporter reports; do +for component in diagnostics reports; do if [[ ! -f "$component/requirements.txt" || ! -d "$component/tests" || ! -x "$component/test.sh" ]]; then echo "Missing $component checks. Run: git submodule update --init --recursive" >&2 exit 1 fi done +if [[ ! -f reporter/requirements.txt || ! -x reporter/render.sh || ! -x reporter/tests/test.sh ]]; then + echo "Missing reporter entrypoint or checks. Run: git submodule update --init --recursive" >&2 + exit 1 +fi command -v typst >/dev/null 2>&1 || { echo 'Typst is required for Reportist rendering checks.' >&2 @@ -22,11 +26,14 @@ command -v typst >/dev/null 2>&1 || { typst --version uv --version -for component in diagnostics reporter; do +for component in diagnostics; do echo "Checking $component ($(git -C "$component" rev-parse HEAD))" "$component/test.sh" done +echo "Checking reporter ($(git -C reporter rev-parse HEAD))" +reporter/tests/test.sh + echo "Checking reports ($(git -C reports rev-parse HEAD))" DIAGNOSTIC_VALIDATOR="$(pwd)/diagnostics/tools/validate.sh" \ REPORT_VALIDATOR="$(pwd)/reporter/tools/validate.sh" \ diff --git a/scripts/workflow-all.sh b/scripts/workflow-all.sh index 9a68a81..488ea7e 100755 --- a/scripts/workflow-all.sh +++ b/scripts/workflow-all.sh @@ -20,6 +20,6 @@ reports/tools/diagnostic-to-report-all.sh --diagnostic-dir "$output_root/diagnos --branding "$PWD/reports/config/branding/default.json" --branding-root "$PWD/reports" while IFS= read -r -d '' report; do relative=${report#"$output_root/generations/"}; relative=${relative%/report.draft.json} - reporter/tools/render.sh "$report" --output "$output_root/pdfs/$relative.pdf" + reporter/render.sh "$report" --output "$output_root/pdfs/$relative.pdf" done < <(find "$output_root/generations" -type f -name report.draft.json -print0 | sort -z) echo "Created diagnostics, draft generations, and PDFs under $output_root" diff --git a/scripts/workflow.sh b/scripts/workflow.sh index 9491108..a8ea7c2 100755 --- a/scripts/workflow.sh +++ b/scripts/workflow.sh @@ -47,7 +47,7 @@ draft() { render() { [[ $# -eq 2 ]] || usage require_values "$@" - bash reporter/tools/render.sh "$1" --output "$2" + bash reporter/render.sh "$1" --output "$2" } command_name="${1:-}"